376 Commits

Author SHA1 Message Date
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
abel1502
9942632231
Fix TileEntityScaffoldDynamic 2024-09-23 16:21:57 +03:00
Bob
ca14f47cbc the malicious gigglefish from the silly dimension 2024-09-19 21:59:18 +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
Boblet
3a81e79554 *pipe falling sound effect* 2024-09-17 15:47:50 +02:00
Boblet
0809bc223f Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself. 2024-09-06 22:05:50 -05:00
BallOfEnergy
1195f28d8e holy shit im done (part 2) 2024-09-06 22:04:19 -05:00
Bob
13ffc6a66a refactor, new keybind system 2024-09-02 22:39:59 +02:00
Boblet
b8d24b5c2d battery packs 2024-08-20 16:30:15 +02:00
Boblet
6011e9df98 bedrock sellafite 2024-08-14 15:45:58 +02:00
Boblet
1523547467 removed more crap 2024-08-13 11:21:44 +02:00
Bob
9ebcab3244 fixes, plushies 2024-08-05 00:47:32 +02:00
Bob
a016dd906a fixes 2024-06-18 20:45:16 +02:00
George Paton
6ce3ff1a5c guraeto daze 2024-06-11 11:24:57 +10:00
George Paton
7d26a51c6b Fix funky placement issues 2024-06-07 14:25:46 +10:00
George Paton
0c26d45a71 Fix sunk grate side rendering, and prevent sunk placements over air blocks 2024-06-07 13:24:10 +10:00
George Paton
7eb8900c13 crouch-clicking is grate 2024-06-06 21:15:43 +10:00
Boblet
14c5941bab even more throughput 2024-06-05 12:11:18 +02:00
HbmMods
e296fbf636
Merge pull request #1525 from MellowArpeggiation/fence
fenc
2024-06-04 07:41:23 +02:00
George Paton
27cf5ca091 Fence blocks can be converted into posts 2024-06-04 11:07:53 +10:00
George Paton
5241ff661b Automatic fence posts 2024-06-03 19:26:38 +10:00
George Paton
df7675c48e I _might_ be stupid 2024-06-03 17:06:57 +10:00
70000hp
211beb1e4c when the stairs (and slabs) are speedy 2024-05-30 19:27:33 -04:00
Boblet
7dfba03dff the wire re-wireing 2024-05-24 15:03:17 +02:00
Bob
be9a87c6af amputation 2024-05-11 20:47:19 +02:00
George Paton
1c9c7f47fb
Merge branch 'HbmMods:master' into master 2024-05-08 17:48:29 +10:00
George Paton
1734e45646 Explosive block rework:
* All blocks now spawn entities when destroyed by an explosion, rather than instantly exploding
* Explosive/Waste barrels now fly off as an entity, exploding when contacting a surface
* All other explosives instead spawn a zero tick entity to prevent a stack overflow while retaining existing behaviour
* onShot behaviour added to simplify blocks that should explode when shot at
2024-05-08 13:16:20 +10:00
Bob
6c234df753 some more of that 2024-05-05 20:50:39 +02:00
Bob
b72b66a083 (it's tia's PJ) 2024-05-02 22:10:02 +02:00
Boblet
31aa445f31 texture update 2024-04-30 15:54:22 +02:00
Boblet
3ab501682d even more spring cleaning 2024-04-22 16:15:49 +02:00
HbmMods
1f271f6b23
Merge pull request #1432 from HbmMods/TSPA
guess what TSPA stands for
2024-04-14 14:23:06 +02:00
Boblet
c9c6549340 everything is falling the fuck apart 2024-04-09 16:55:53 +02:00
Bob
f904636517 we're in a rush now 2024-03-31 21:55:59 +02:00
Boblet
7be71dfb99 fixes, foxes, flixes 2024-03-25 14:38:29 +01:00
Boblet
33e6237377 finished item pool config implementation 2024-03-20 16:46:05 +01:00
Bob
9cf673206a flash! bam! alakazam! 2024-03-17 17:31:50 +01:00
Boblet
7429327034 making use of the pollution tag 2024-03-12 16:32:54 +01:00
Boblet
3e716bf3fc cap blocks with meta, customizable bedrock ores 2024-03-11 16:20:32 +01:00
Bob
bc3a3ef2a2 these changes are like 2 days old and i forgot what i even did 2024-03-10 22:26:48 +01:00
Bob
98115ac784 i forgor 2024-03-05 21:41:56 +01:00
Boblet
23e58c7e1d 0000000000 2024-03-04 16:44:34 +01:00
Boblet
b2b0c79bb9 missing star control pieces, snowglobes, broken turret 2024-03-01 15:06:39 +01:00
Bob
0c8ee5aa19 toasters, crappy screens 2024-02-28 21:01:07 +01:00
George Paton
e20c5ddd04 Add Mellow bobblehead 2024-02-23 23:48:39 +11:00
George Paton
5d63b80777 Fix spotlight beams crashing in nuclear explosions
Fix nuclear fallout depositing in midair on top of beams
2024-02-23 15:47:00 +11:00
Bob
7ad017ec8e eeeeeeee macarena! 2024-02-18 17:52:42 +01:00
Boblet
6f00c68051 tweaks, recipes, hydrotreater texture 2024-02-12 16:49:47 +01:00