BallOfEnergy
|
b4b9042065
|
Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
# src/main/java/com/hbm/tileentity/network/TileEntityCraneGrabber.java
|
2024-10-14 22:02:36 -05:00 |
|
Boblet
|
a9838aedd9
|
added new explosion effects to more bombs, grabber improvements
|
2024-10-14 16:48:16 +02:00 |
|
BallOfEnergy
|
88f5ac1cf1
|
Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
# src/main/java/com/hbm/tileentity/TileEntityMachineBase.java
# src/main/java/com/hbm/tileentity/machine/TileEntityHeaterElectric.java
# src/main/java/com/hbm/tileentity/machine/TileEntityMachineSolderingStation.java
# src/main/java/com/hbm/tileentity/machine/TileEntityPWRController.java
# src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityCraneConsole.java
# src/main/java/com/hbm/tileentity/network/TileEntityCraneGrabber.java
|
2024-10-10 19:41:23 -05: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 |
|
Bob
|
a6f694b7b3
|
GUNMETAL
|
2024-09-29 20:56:11 +02:00 |
|
Bob
|
ee895c9bfc
|
WAR
|
2024-09-26 21:33:17 +02:00 |
|
George Paton
|
408a03ab47
|
Fix GL state leak in fluid tank rendering
|
2024-09-26 13:05:49 +10: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 |
|
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 |
|
BallOfEnergy
|
1bd15dfa78
|
fixes after the merge conflicts (death)
|
2024-09-06 22:28:00 -05:00 |
|
BallOfEnergy
|
16d2d86add
|
holy shiiiiiiiiiitttt RBMK optimization update
|
2024-09-06 21:54:14 -05:00 |
|
Boblet
|
2bc76661b0
|
fixes
|
2024-09-02 16:44:24 +02:00 |
|
Bob
|
5f28c8b289
|
more assets
|
2024-09-01 20:21:20 +02:00 |
|
Boblet
|
556e98c0d3
|
i spent all day doing stupid shit
|
2024-08-28 16:34:49 +02:00 |
|
Bob
|
e11b9a2a41
|
lesbian ponies with weapons
|
2024-08-27 22:27:11 +02:00 |
|
Boblet
|
85e3e50d54
|
ore density scanner HUD fix
|
2024-08-27 15:42:57 +02:00 |
|
Bob
|
1caeec5ea9
|
d(err)ick
|
2024-08-18 21:00:27 +02:00 |
|
Bob
|
3aef7e1577
|
i love to drink oil
|
2024-08-15 20:38:22 +02:00 |
|
Boblet
|
d70ea038a0
|
an big slappy
|
2024-08-12 16:26:09 +02:00 |
|
Bob
|
9ebcab3244
|
fixes, plushies
|
2024-08-05 00:47:32 +02:00 |
|
Boblet
|
b3047c875e
|
welcome to super cancer world
|
2024-07-17 16:38:05 +02:00 |
|
Boblet
|
efee0706af
|
you can, in fact, wire a WIAJ into a particle renderer
|
2024-07-17 10:37:12 +02:00 |
|
Boblet
|
83f8c5a7f9
|
why
|
2024-07-16 16:30:03 +02:00 |
|
Bob
|
7896c0443a
|
the death of RNG
|
2024-07-14 20:48:35 +02:00 |
|
Bob
|
e7428fb5ab
|
camera, lights, action
|
2024-07-14 13:35:28 +02:00 |
|
Boblet
|
ef228577d9
|
the heinous slop
|
2024-07-10 16:33:33 +02:00 |
|
Bob
|
ec52959304
|
the creation of slop
|
2024-06-29 22:26:52 +02:00 |
|
Bob
|
65d9f82b7d
|
slop
|
2024-06-26 21:51:32 +02:00 |
|
Boblet
|
07a2dcc295
|
*deletes half the mod*
|
2024-06-21 14:36:37 +02:00 |
|
Bob
|
da9c44e108
|
*throws 155 pound anvil at you*
|
2024-06-09 21:03:47 +02:00 |
|
Bob
|
a21a0934a6
|
the malicious gigglefish from the silly dimension
|
2024-06-09 01:12:53 +02:00 |
|
Bob
|
41f9b41ef9
|
sold(i)er TF2
|
2024-05-23 23:12:29 +02:00 |
|
Boblet
|
1f94b6b7a6
|
arc furnace recipe crap, soldering station
|
2024-05-23 16:06:43 +02:00 |
|
Bob
|
f39b5a0e2c
|
crushin' crushin' (the second)
|
2024-05-20 19:28:46 +02:00 |
|
Bob
|
af53a9b09f
|
i need to finger the wall outlet with a fork
|
2024-05-19 00:22:33 +02:00 |
|
Bob
|
be9a87c6af
|
amputation
|
2024-05-11 20:47:19 +02:00 |
|
George Paton
|
d3e7a9b857
|
Improve RBMK render CPU performance by switching to VBOs
|
2024-05-07 16:16:46 +10:00 |
|
Bob
|
39ca87d7a9
|
the feds are trying to poison me
|
2024-05-04 22:23:19 +02:00 |
|
Boblet
|
3ab501682d
|
even more spring cleaning
|
2024-04-22 16:15:49 +02:00 |
|
George Paton
|
3c760ba95d
|
Fix up door rendering, moving it to a more generic interface
|
2024-04-18 17:14:04 +10:00 |
|
George Paton
|
24001a0ae8
|
Replace DisplayLists with VBOs!
Gotta fix the door rendering though, elided for now
|
2024-04-18 14:26:20 +10:00 |
|
Boblet
|
5b41c3d83a
|
paintable pylon wires
|
2024-04-16 14:54:06 +02:00 |
|
Bob
|
bed04f4311
|
plylons
bylons
plons
|
2024-04-14 17:18:57 +02:00 |
|
HbmMods
|
1f271f6b23
|
Merge pull request #1432 from HbmMods/TSPA
guess what TSPA stands for
|
2024-04-14 14:23:06 +02:00 |
|
Bob
|
e5dffd3d2a
|
NEITHER SNOW NOR RAIN NOR THE GLOOM OF NIGHT
|
2024-04-11 21:58:47 +02:00 |
|
Bob
|
f904636517
|
we're in a rush now
|
2024-03-31 21:55:59 +02:00 |
|
Bob
|
bc65f80501
|
removed more useless crap
|
2024-03-24 18:26:21 +01:00 |
|