3148 Commits

Author SHA1 Message Date
Boblet
ea895daa85 shells and casings 2024-10-02 16:58:12 +02:00
abel1502
5944999cf9
Fix rbmk crane rotation 2024-10-02 16:21:33 +03:00
abel1502
8da78f6895
Make RBMK crane rotatable visually 2024-10-02 14:07:32 +03:00
Bob
75df8fb945 ATLAS 2024-10-01 21:35:43 +02:00
Boblet
0bdfe286e4 shapes 2024-10-01 16:56:39 +02:00
HbmMods
a4e321f4c9
Merge pull request #1710 from abel1502/abel-strand-caster
Improve strand caster
2024-10-01 07:55:52 +02:00
abel1502
4b59c55c5a
Remove the upgrade, just change the caster 2024-10-01 00:18:24 +03:00
Bob
6cddb3e238 NEI stuff, textures 2024-09-30 22:12:21 +02:00
abel1502
63926ccd4a
Add strand caster unclogging upgrade 2024-09-30 23:04:14 +03:00
Boblet
ad3c4e20ca it's fucking lego! 2024-09-30 16:55:43 +02:00
Bob
a6f694b7b3 GUNMETAL 2024-09-29 20:56:11 +02:00
Bob
ee895c9bfc WAR 2024-09-26 21:33:17 +02:00
Boblet
f7e804094c it's recoil! 2024-09-26 14:05:48 +02:00
HbmMods
d21f23287b
Merge branch 'master' into push-ups 2024-09-26 11:35:21 +02:00
George Paton
441a46f24f Revert all that gradle bullshit and do reflection instead 2024-09-26 19:27:20 +10:00
Boblet
2584934e0b ended endlessIDs 2024-09-26 11:25:11 +02:00
George Paton
408a03ab47 Fix GL state leak in fluid tank rendering 2024-09-26 13:05:49 +10:00
George Paton
b36cf4213f Horizontal scaffolding 2024-09-26 12:51:29 +10:00
George Paton
8bbed76758 Basalt side textures 2024-09-26 12:50:49 +10:00
George Paton
df5df13396 Fix basalt ores and stalagmites/tites middle-clicking to sulfur 2024-09-26 12:49:40 +10:00
George Paton
5223998fcb middle click fixerrrr 2024-09-26 12:48:47 +10:00
George Paton
0f17007306 tabbbbbbbbbbbbbbbs 2024-09-26 12:37:36 +10:00
George Paton
70be7c4cf5 EndlessIDs compat 2024-09-26 12:27:07 +10:00
Bob
eb157ea874 gun jamming 2024-09-25 21:47:45 +02:00
Boblet
0f277657db bullet damage, armor pen, durability stats 2024-09-25 16:45:42 +02:00
Bob
1d92bcbf13 ball and powder torture 2024-09-24 23:53:14 +02:00
Boblet
36a02151bc sure whatever 2024-09-24 16:13:39 +02:00
HbmMods
d0a61f964a
Merge pull request #1694 from abel1502/abel-cache-packets
Cache tile entity network packets
2024-09-24 08:04:38 +02:00
HbmMods
3ac994c707
Merge pull request #1693 from abel1502/abel-crates-crafting
Fix #1690 (upgrading crates & mass storage)
2024-09-24 07:58:58 +02:00
Bob
b2c2ce9e4e casing ejectors, bullet ricochet 2024-09-23 22:39:38 +02:00
abel1502
c41bdc6886
Fix TileEntityScaffoldDynamic 2024-09-23 18:44:02 +03:00
abel1502
c5fa0c5d2b
Fix builder's choice concrete tooltip 2024-09-23 18:41:57 +03:00
abel1502
df92d913da
Add caching for TileEntityMachineBase update packages
Now they aren't send unless something has changed,
except for one every second as a workaround
for an apparent issue
2024-09-23 18:36:03 +03:00
abel1502
8aad7fb44b
Fix conveyor grabber delay 2024-09-23 18:21:57 +03:00
abel1502
9942632231
Fix TileEntityScaffoldDynamic 2024-09-23 16:21:57 +03:00
abel1502
cf69c0e4c0
Preserve inventories of crates and mass storages when upgrading 2024-09-23 16:20:17 +03:00
Bob
42b7d1f657 dry fire animations, clicky stuff 2024-09-22 22:52:47 +02:00
Bob
51839e8abb substantial amounts of trolling 2024-09-22 00:03:28 +02:00
Boblet
fcf0f0d2d9 yet more gun stuff! 2024-09-20 15:03:52 +02:00
Bob
ca14f47cbc the malicious gigglefish from the silly dimension 2024-09-19 21:59:18 +02:00
Boblet
b65dd8ef88 minor recipe changes 2024-09-19 16:57:14 +02:00
BallOfEnergy
e7b5240a9d Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityAshpit.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityCondenser.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityCore.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnace.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnaceRTG.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityFurnaceIron.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityFurnaceSteel.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoiler.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoilerIndustrial.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityHeaterHeatex.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutosaw.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineCombustionEngine.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineCompressor.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineEPress.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineHephaestus.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineMixer.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachinePress.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachinePumpBase.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadGen.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineSolderingStation.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineStrandCaster.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java
#	src/main/java/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java
#	src/main/java/com/hbm/tileentity/machine/TileEntitySteamEngine.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCatalyticCracker.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCatalyticReformer.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCoker.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineGasFlare.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineLiquefactor.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineRefinery.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineSolidifier.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineVacuumDistill.java
#	src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKConsole.java
#	src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlAuto.java
#	src/main/java/com/hbm/tileentity/machine/storage/TileEntityMassStorage.java
#	src/main/java/com/hbm/tileentity/network/TileEntityCraneRouter.java
#	src/main/java/com/hbm/tileentity/network/TileEntityDroneCrate.java
#	src/main/java/com/hbm/tileentity/network/TileEntityDroneRequester.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretFritz.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretMaxwell.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
2024-09-18 19:07:46 -05:00
Bob
bc2c2960e3 :PainB: 2024-09-18 21:10:11 +02:00
Bob
1384f14fe3 a ton of gun stuff 2024-09-17 21:30:34 +02:00
Boblet
3a81e79554 *pipe falling sound effect* 2024-09-17 15:47:50 +02:00
Boblet
c3bc6c6bba flixes 2024-09-16 16:35:37 +02:00
Bob
ee8089ddf4 my ass is heavy 2024-09-15 22:45:57 +02:00
Boblet
2a81e2c5a7 cleanup 2024-09-13 13:17:51 +02:00
HbmMods
23471b1ad1
Merge branch 'master' into more-more-qol 2024-09-13 08:12:03 +02:00
BallOfEnergy
bad3d3f031
Merge branch 'HbmMods:master' into Optimization 2024-09-12 13:06:30 -05:00