510 Commits

Author SHA1 Message Date
Boblet
31eeb2ab94 heaven sent & hell bent 2025-01-22 16:55:52 +01:00
Boblet
4024249bec deplorable gollompus 2025-01-21 16:44:09 +01:00
Bob
6373c09081 PERFLUOROMETHYL WANTS TO KNOW YOUR LOCATION 2025-01-19 22:45:37 +01:00
Biohazard041
57bdd1fba0
Update GUIRBMKControlAuto.java
Typo :)
2025-01-13 23:28:17 -05:00
BallOfEnergy
e1bdae1241 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/blocks/ModBlocks.java
#	src/main/java/com/hbm/lib/HbmCollection.java
#	src/main/java/com/hbm/main/ClientProxy.java
#	src/main/java/com/hbm/main/MainRegistry.java
#	src/main/java/com/hbm/main/ModEventHandler.java
#	src/main/java/com/hbm/main/NEIConfig.java
#	src/main/java/com/hbm/util/LootGenerator.java
2024-12-26 19:43:36 -06:00
Bob
6e44aeea8d return the slab, or suffer my curse 2024-12-23 01:01:29 +01:00
BallOfEnergy
2776a6f347 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/blocks/ModBlocks.java
#	src/main/java/com/hbm/handler/EntityEffectHandler.java
#	src/main/java/com/hbm/main/ClientProxy.java
#	src/main/java/com/hbm/main/CraftingManager.java
#	src/main/java/com/hbm/main/MainRegistry.java
#	src/main/java/com/hbm/main/ModEventHandlerClient.java
#	src/main/java/com/hbm/main/ModEventHandlerRenderer.java
#	src/main/java/com/hbm/main/NEIConfig.java
#	src/main/java/com/hbm/main/ResourceManager.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretRichard.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretSentry.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretTauon.java
#	src/main/java/com/hbm/util/CompatExternal.java
#	src/main/java/com/hbm/util/CrucibleUtil.java
#	src/main/java/com/hbm/util/EntityDamageUtil.java
2024-12-16 18:18:46 -06:00
Bob
f49b832c96 fuck 2024-12-08 22:30:42 +01:00
BallOfEnergy
9409fba056 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/main/ResourceManager.java
2024-11-09 17:09:17 -06:00
Boblet
cb14ffc638 shotshell recipes, some tweaks 2024-11-08 15:11:01 +01:00
BallOfEnergy
d056a845e0
Merge branch 'HbmMods:master' into Optimization 2024-11-07 14:46:11 -06:00
Boblet
b9787fa08e the mechanism 2024-11-07 15:50:14 +01:00
Bob
4f60e44f8e let me just *removes entire barrel* 2024-11-06 22:16:39 +01:00
Boblet
e64a21ffd3 recipe crap 2024-11-06 16:37:34 +01:00
BallOfEnergy
6516ff7aa2
Merge branch 'HbmMods:master' into Optimization 2024-11-05 14:12:38 -06:00
Boblet
1e37d14de2 delete .metadata they said, it'll fix caching issues they said 2024-11-05 16:07:53 +01:00
BallOfEnergy
31c6809c65 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/main/ModEventHandlerRenderer.java
2024-10-20 12:54:06 -05:00
Boblet
a1401b47e2 my ass is bleeding 2024-10-16 17:00:07 +02:00
Boblet
402690cb87 miserable mutant glyphids 2024-10-15 13:14:18 +02:00
BallOfEnergy
e38ce02ccf Upgrade rework, now with 3463% more caching!
(it was slow and needed a redo)
2024-10-14 22:00:39 -05:00
Bob
75df8fb945 ATLAS 2024-10-01 21:35:43 +02:00
Boblet
0bdfe286e4 shapes 2024-10-01 16:56:39 +02:00
Bob
a6f694b7b3 GUNMETAL 2024-09-29 20:56:11 +02:00
Boblet
3a81e79554 *pipe falling sound effect* 2024-09-17 15:47:50 +02:00
Bob
ee8089ddf4 my ass is heavy 2024-09-15 22:45:57 +02:00
Bob
7f91038b08 conveyor destroyer mode 2024-09-08 21:30:47 +02:00
Bob
13ffc6a66a refactor, new keybind system 2024-09-02 22:39:59 +02:00
Boblet
680678b5b2 🅱️attery 2024-08-19 16:38:29 +02:00
HbmMods
0e2b7e09b6
Merge branch 'master' into OC_bugfix 2024-08-19 15:10:57 +02:00
BallOfEnergy
84d2528464 kms (fix cutting off of refinery gui) 2024-08-18 15:17:20 -05:00
Bob
1caeec5ea9 d(err)ick 2024-08-18 21:00:27 +02:00
BallOfEnergy
9d59218909 aaaaaaaaaaaaa 2024-08-17 12:26:08 -05:00
HbmMods
fd1bb4e28d
Merge pull request #1624 from BallOfEnergy1/OC_bugfix
WOO!!
2024-08-13 11:21:53 +02:00
Boblet
d70ea038a0 an big slappy 2024-08-12 16:26:09 +02:00
BallOfEnergy
c89f1b411f ughhhh
ok I fixed some bugs with OC compat and added new refinery GUI
(bugs were in CCGT `setThrottle()` function and the TELEX `setSendingText()`)
2024-08-11 22:02:54 -05:00
Boblet
8a200a50bd better particle spawner structure, killed off boilers 2024-07-18 16:04:41 +02:00
Boblet
28e1fdd7f5 cleanup 2024-07-11 16:05:25 +02:00
70000hp
d4e9a5d010 Autocrafter uncluttering and drag drop support 2024-07-10 13:02:30 -04:00
70000hp
851d6fb0bf Merge branch 'master' into NEI-schenanigans 2024-07-10 12:16:45 -04:00
Boblet
2eb341ee33 well that was a massive waste of time 2024-07-02 14:31:12 +02:00
Bob
ec52959304 the creation of slop 2024-06-29 22:26:52 +02:00
70000hp
4951975d99 Merge branch 'master' into NEI-schenanigans 2024-06-29 13:40:41 -04:00
BallOfEnergy
72e4cb42e0
Merge branch 'HbmMods:master' into OC_bugfix 2024-06-27 21:09:59 -05:00
Boblet
456a7251d4 a metric fuckton of recipes 2024-06-27 16:37:13 +02:00
Bob
b0ae1c8cee config crap, player deco and some fixes 2024-06-23 22:25:48 +02:00
Bob
a016dd906a fixes 2024-06-18 20:45:16 +02:00
Vaern
b1b0ba0a93 flixes 2024-06-15 21:35:25 -07:00
BallOfEnergy
bc45b66052 Force PWR to use doubles as control rod values, round to 100s place when displaying to prevent floating-point errors looking terrible.
also add cable gauge and radar compat
telex is next
2024-06-11 16:28:59 -05:00
Bob
a21a0934a6 the malicious gigglefish from the silly dimension 2024-06-09 01:12:53 +02:00
70000hp
518a949306 my bONES 2024-06-02 12:50:52 -04:00