446 Commits

Author SHA1 Message Date
BallOfEnergy
d217cfb7f3 i fucking hate github
this is to fix everything that github just broke
including removing the shit from that one PR that broke everything
2023-11-30 14:18:03 -06:00
BallOfEnergy
b9f14fd471 Merge remote-tracking branch 'origin/New_master' into New_master
# Conflicts:
#	changelog
#	src/main/java/api/hbm/entity/IRadarDetectableNT.java
#	src/main/java/api/hbm/entity/RadarEntry.java
#	src/main/java/com/hbm/handler/CompatHandler.java
#	src/main/java/com/hbm/inventory/gui/GUIMachineRadarNT.java
#	src/main/java/com/hbm/packet/BufPacket.java
#	src/main/java/com/hbm/packet/PacketDispatcher.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadar.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadarNT.java
#	src/main/resources/assets/hbm/textures/gui/machine/gui_radar_nt.png
2023-11-28 21:56:20 -06:00
BallOfEnergy
c86e52f5c0 pretty important fix where crane consoles would move 4x faster than possible 2023-11-28 21:46:17 -06:00
BallOfEnergy
0f25aac3a2 back at it again with the OC compat
Now including:
Optimizations
Turbine Compat
Compat handler for general functions
other compat
2023-11-28 21:46:05 -06:00
sdddddf80
34865547c4 Transferred a bunch of text to lang file
Transferred a bunch of text to lang file(not all)
2023-11-28 21:46:04 -06:00
Boblet
45fe9a81b2 MINE THE NITRA FOR AMMO 2023-11-26 20:21:41 +01:00
BallOfEnergy
17044d558b back at it again with the OC compat
Now including:
Optimizations
Turbine Compat
Compat handler for general functions
other compat
2023-11-14 19:18:43 -06:00
sdddddf80
fe152fb676 Transferred a bunch of text to lang file
Transferred a bunch of text to lang file(not all)
2023-11-08 16:47:35 +08:00
Boblet
a5c49f6d64 flixes 2023-11-07 15:59:04 +01:00
Boblet
ba61cc42a8 quick gordon, the mcgriddle is still on the menu! 2023-11-02 14:12:39 +01:00
Boblet
f846b7884d plenty of fixes 2023-10-16 16:00:10 +02:00
Bob
b702816057 finished arc welder, fixes 2023-10-08 18:45:45 +02:00
Bob
8ce3e9837b "today i will get shit done" and other jokes you can tell yourself 2023-09-17 20:11:53 +02:00
Boblet
b04e73422d ashpit NEI handling, ashpit for chimneys, removed old trash, fixes 2023-09-15 13:10:36 +02:00
Bob
282228239f fixes, armor sprites 2023-09-12 22:04:26 +02:00
Bob
37eb69e47d wa'er pumps, new capacitor, fixes 2023-09-10 21:02:20 +02:00
70000hp
ad826215ee i forogr 2023-09-01 16:18:50 -04:00
70000hp
9e2d2dba01 burst fire for the UAC pistol 2023-09-01 16:09:21 -04:00
70000hp
16f710450c actual burst fire logic
also adds burst fire to josh
2023-09-01 16:07:48 -04:00
HbmMods
1448241515
Merge pull request #1177 from 70000hp/josh-anims
Animations for Josh
2023-08-31 16:40:07 +02:00
HbmMods
6440a6fe4d
Merge pull request #1175 from 70000hp/ammo-variant-tweaks
Ammo variant tweaks
2023-08-31 16:36:32 +02:00
70000hp
cb90b2973c josh anims :3 2023-08-31 10:13:54 -04:00
Boblet
2ff5096562 spiralpoint visualization, less console spam from pollution handler 2023-08-31 15:50:42 +02:00
70000hp
e0d13496cd Improved chloro rounds logic 2023-08-30 12:28:48 -04:00
70000hp
a7d393e663 some things I forgot 2023-08-29 16:56:00 -04:00
70000hp
48a058fadb less painful ammo recipes + chloro rounds fnuy 2023-08-29 16:14:19 -04:00
Григорий Величко
cb0eb4271b
Fix hbmpollution.dat file on Crucible and probably Thermos 2023-08-16 15:24:51 +03:00
Bob
157456a0c8 ashpit 2023-08-13 21:04:12 +02:00
Bob
27648ca7a6 lanterns, heating oven connection fix 2023-08-12 22:46:59 +02:00
Bob
1a3596f33d finished leadburster, congo lake grenade launcher 2023-08-12 00:04:42 +02:00
Boblet
98ec88678a leadburster tweaks 2023-08-11 14:18:23 +02:00
Boblet
3b94f3dafd 40mm leadburster 2023-08-11 12:02:18 +02:00
Boblet
30e2a13f62 fixing mojank spaghetti episode 58304 2023-08-10 15:18:54 +02:00
Bob
93ded2740a NEI handlers, more suffering 2023-08-05 20:09:21 +02:00
Bob
ef44b79f83 suffering builds character 2023-08-05 16:33:23 +02:00
Bob
a869a57ff2 NEI handlers for custom machines, nether bedrock ores, electrolyser crap 2023-07-31 20:45:57 +02:00
Bob
1ffb2737aa ow 2023-07-25 22:21:48 +02:00
Bob
4bc09afb1f even more custom machine crap 2023-07-22 18:30:32 +02:00
Bob
0ff16c1a6c more coilgun ammo 2023-07-16 20:39:28 +02:00
Bob
ea8dcd9508 tweaks and fixes, template crate 2023-07-15 22:30:49 +02:00
Boblet
24a0fbffef ported all bullet effects to the NT system 2023-07-14 15:09:46 +02:00
Bob
5bcffadbab new bullet base code 2023-07-13 20:20:14 +02:00
Bob
6bd552f3be cryo cannon, bullet stuff 2023-07-12 23:23:14 +02:00
Boblet
13c4cdc24d cryo cannon 2023-07-11 16:06:44 +02:00
Bob
18a1b103ba some pistol tweaks, compressor fix, cryo cannon texture 2023-07-10 21:38:41 +02:00
Boblet
de028bb5e1 UAC pistol, damage util crap, mk5 fix 2023-07-10 15:48:09 +02:00
Bob
925236e538 iboiler texture, coilgun, bunch of fixes, recipes 2023-07-09 17:28:11 +02:00
Boblet
873e41558f and now for something completely different 2023-07-07 09:20:32 +02:00
Bob
4ad28d25f4 industrial boiler 2023-07-04 22:12:10 +02:00
Boblet
d09813957e small fixes 2023-07-03 15:41:39 +02:00