BallOfEnergy
|
063ab4032f
|
yeah these are commits from like a month ago idk what any of this is
|
2024-10-10 19:44:30 -05: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 |
|
Boblet
|
2584934e0b
|
ended endlessIDs
|
2024-09-26 11:25:11 +02:00 |
|
George Paton
|
70be7c4cf5
|
EndlessIDs compat
|
2024-09-26 12:27:07 +10: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 |
|
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
|
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 |
|
Boblet
|
85925a54dc
|
fixes
|
2024-09-12 16:21:56 +02: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 |
|
Bob
|
13ffc6a66a
|
refactor, new keybind system
|
2024-09-02 22:39:59 +02:00 |
|
70000hp
|
b5f2bb3355
|
Merge branch 'master' into more-more-qol
|
2024-08-30 17:34:39 -04:00 |
|
Boblet
|
85e3e50d54
|
ore density scanner HUD fix
|
2024-08-27 15:42:57 +02:00 |
|
Boblet
|
b8d24b5c2d
|
battery packs
|
2024-08-20 16:30:15 +02:00 |
|
70000hp
|
ec84179e3f
|
god DAMN
Implemented switching between copiable traits + big change in logic thanks martinthedragon
|
2024-08-16 19:41:53 -04:00 |
|
70000hp
|
1495dfc2b5
|
pain
|
2024-08-12 17:38:15 -04:00 |
|
Bob
|
f97076bb94
|
guh
|
2024-08-02 23:43:19 +02:00 |
|
Boblet
|
2eb341ee33
|
well that was a massive waste of time
|
2024-07-02 14:31:12 +02:00 |
|
Bob
|
b0ae1c8cee
|
config crap, player deco and some fixes
|
2024-06-23 22:25:48 +02:00 |
|
George Paton
|
2960c29918
|
Add ByteBuf string reader/writer, and migrate the biggest CPU time offenders to ByteBuf packets
|
2024-06-07 18:20:43 +10:00 |
|
Boblet
|
7dfba03dff
|
the wire re-wireing
|
2024-05-24 15:03:17 +02:00 |
|
Boblet
|
503b3b15d7
|
making the voices stop - angle grinder edition
|
2024-05-15 15:06:08 +02:00 |
|
Bob
|
be9a87c6af
|
amputation
|
2024-05-11 20:47:19 +02:00 |
|
Bob
|
664d251e14
|
constant restructuring
|
2024-05-09 19:30:44 +02:00 |
|
Bob
|
b72b66a083
|
(it's tia's PJ)
|
2024-05-02 22:10:02 +02:00 |
|
Boblet
|
5b41c3d83a
|
paintable pylon wires
|
2024-04-16 14:54:06 +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
|
7429327034
|
making use of the pollution tag
|
2024-03-12 16:32:54 +01:00 |
|
Boblet
|
b30bb8ae15
|
last bit of EC compat stuff
|
2024-02-21 16:31:34 +01:00 |
|
Boblet
|
79d57071b7
|
fixes, flixes and foxes
|
2024-02-19 15:55:48 +01:00 |
|
Boblet
|
efa790fe75
|
life extender rework, more EC compat
|
2024-02-16 15:01:25 +01:00 |
|
Boblet
|
675838eec7
|
more energy control compat stuff
|
2024-02-15 16:10:53 +01:00 |
|
HbmMods
|
ab4c14e3f4
|
Merge pull request #1333 from Vaern/structure-2
RuralHouse Structure
|
2024-02-11 22:20:11 +01:00 |
|
Vaern
|
b39eb2a52b
|
reworksing furniture
|
2024-02-10 17:52:40 -08:00 |
|
Vaern
|
1bd5efe0a7
|
added rural house, few additions
don't think i've ever needed the pattern tool but at least it works now
|
2024-02-09 23:19:34 -08:00 |
|
Boblet
|
2eb3247d67
|
first batch of Energy Control compat code
|
2024-02-09 14:44:44 +01:00 |
|
Bob
|
67980608ac
|
oops
|
2024-01-28 21:37:40 +01:00 |
|
Boblet
|
174c7271a9
|
shit i really want in my survival world
|
2024-01-26 13:37:16 +01:00 |
|
Bob
|
aa8e492610
|
molysite, mud hole
|
2024-01-21 00:28:26 +01:00 |
|
Boblet
|
a647f93f15
|
incinerated old garbage
|
2024-01-11 16:35:55 +01:00 |
|
Boblet
|
e3d167ff01
|
yeag
|
2024-01-09 13:08:15 +01:00 |
|
Bob
|
3416dbe14f
|
fancier glyphid hives, maggots
|
2023-12-16 18:24:43 +01:00 |
|
Bob
|
ace7812d3f
|
rubber dinghy fixes, missile recipe stuff
|
2023-11-30 22:10:41 +01:00 |
|