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 |
|
HbmMods
|
89139ec30e
|
Merge pull request #1669 from 9Valjew/master
Satellite List Command
|
2024-09-12 16:22:41 +02:00 |
|
HbmMods
|
edd88aed6c
|
Merge pull request #1672 from 70000hp/miniscule-528-thing
tiny little baby pr
|
2024-09-12 16:22:13 +02:00 |
|
Boblet
|
85925a54dc
|
fixes
|
2024-09-12 16:21:56 +02:00 |
|
Bob
|
00f5e8e279
|
keybind bullshittery
|
2024-09-10 21:40:39 +02:00 |
|
Boblet
|
699a8759a7
|
removed a ton of unused crap
|
2024-09-10 16:44:34 +02:00 |
|
70000hp
|
2b221c880b
|
e
Adds a config for 528 nether burning, and makes nether burning only affect players
|
2024-09-09 16:04:39 -04:00 |
|
BallOfEnergy
|
a39dbeb2ec
|
Merge branch 'HbmMods:master' into Optimization
|
2024-09-08 21:03:31 -05:00 |
|
Bob
|
7f91038b08
|
conveyor destroyer mode
|
2024-09-08 21:30:47 +02:00 |
|
BallOfEnergy
|
2706fd2a0c
|
Merge branch 'HbmMods:master' into Optimization
|
2024-09-08 14:16:06 -05:00 |
|
9Valjews
|
fffad80638
|
Added satellite list command
|
2024-09-08 21:50:34 +03:00 |
|
HbmMods
|
59d54942a3
|
Merge pull request #1658 from 9Valjew/satunfuck
Xenium Resonator radar Compat
|
2024-09-08 17:47:07 +02:00 |
|
Bob
|
5d1d96e436
|
the almighty state machine
|
2024-09-08 17:45:57 +02:00 |
|
BallOfEnergy
|
7b65e45663
|
Unused import cleaning!
|
2024-09-06 22:31:27 -05:00 |
|
BallOfEnergy
|
1bd15dfa78
|
fixes after the merge conflicts (death)
|
2024-09-06 22:28:00 -05:00 |
|
BallOfEnergy
|
11a4d5ccf7
|
Merge remote-tracking branch 'origin/Optimization' into Optimization
# Conflicts:
# src/main/java/com/hbm/tileentity/TileEntityMachineBase.java
# src/main/java/com/hbm/tileentity/TileEntityTickingBase.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutosaw.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadarScreen.java
# src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java
# src/main/java/com/hbm/tileentity/network/TileEntityRequestNetworkContainer.java
|
2024-09-06 22:26:53 -05: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 |
|
BallOfEnergy
|
851d70d3de
|
part 1
|
2024-09-06 21:59:06 -05:00 |
|
BallOfEnergy
|
f8e6a60d0f
|
holy shit what the fuck am i smoking
|
2024-09-06 21:59:06 -05:00 |
|
BallOfEnergy
|
47657366cc
|
the ByteBuf shenanigans begin!!
|
2024-09-06 21:59:06 -05:00 |
|
BallOfEnergy
|
931bbb3d8c
|
oh my fucking god
|
2024-09-06 21:59:05 -05:00 |
|
BallOfEnergy
|
bc0d1059d8
|
i want to kill myself ❤️
|
2024-09-06 21:59:03 -05:00 |
|
BallOfEnergy
|
8b5bfda162
|
more shit
|
2024-09-06 21:57:32 -05:00 |
|
BallOfEnergy
|
5a06075a9c
|
fix up some imports!
|
2024-09-06 21:57:30 -05:00 |
|
BallOfEnergy
|
1aea83ad32
|
i fixed it i fixed it i fixed it i fixed it i fixed it i fixed it
fucking FINALLY
|
2024-09-06 21:57:00 -05:00 |
|
BallOfEnergy
|
06260e7f2b
|
i am going to kms
|
2024-09-06 21:57:00 -05:00 |
|
BallOfEnergy
|
a2632a1785
|
oops
|
2024-09-06 21:57:00 -05:00 |
|
BallOfEnergy
|
841852cc81
|
99.999% there
just some more optimization!
(node culling)
|
2024-09-06 21:56:58 -05:00 |
|
BallOfEnergy
|
639822b48d
|
hooolyyyy shiiiiiiiit
i finally fixed the bug!!!!!!!!!!
|
2024-09-06 21:56:18 -05:00 |
|
BallOfEnergy
|
e32f67c2b2
|
this is fucking insane dude
RBMK optimization update soon!!!!!!!
|
2024-09-06 21:55:28 -05:00 |
|
BallOfEnergy
|
3e487dd528
|
fuck!
|
2024-09-06 21:54:17 -05:00 |
|
BallOfEnergy
|
16d2d86add
|
holy shiiiiiiiiiitttt RBMK optimization update
|
2024-09-06 21:54:14 -05:00 |
|
Boblet
|
b7d0748c26
|
Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.
|
2024-09-06 21:39:50 -05:00 |
|
BallOfEnergy
|
ec15e85e4e
|
holy shit im done (part 2)
|
2024-09-06 19:43:18 -05:00 |
|
Bob
|
49d49d47e3
|
this commit has a working faux first person item renderer
|
2024-09-06 22:11:53 +02:00 |
|
Boblet
|
77cb82b502
|
item rendering code is stored in the balls
|
2024-09-06 15:20:08 +02:00 |
|
Boblet
|
32ab93f146
|
gun crap
|
2024-09-05 16:59:14 +02:00 |
|
BallOfEnergy
|
f0148a12e9
|
part 1
|
2024-09-04 21:55:11 -05:00 |
|
BallOfEnergy
|
4b490d56a1
|
holy shit what the fuck am i smoking
|
2024-09-04 21:37:37 -05:00 |
|
Bob
|
833ae407e5
|
eh
|
2024-09-04 21:46:08 +02:00 |
|
Boblet
|
c64ca0d40c
|
more gun code
|
2024-09-04 16:48:58 +02:00 |
|