BallOfEnergy 1bd15dfa78 fixes after the merge conflicts (death)

2024-09-06 22:28:00 -05:00

..

oil

Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.

2024-09-06 22:05:50 -05:00

pile

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

rbmk

fixes after the merge conflicts (death)

2024-09-06 22:28:00 -05:00

storage

Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.

2024-09-06 22:05:50 -05:00

IRenderFoundry.java

…

TileEntityAshpit.java

the ByteBuf shenanigans begin!!

2024-09-06 21:59:06 -05:00

TileEntityBlastDoor.java

Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.

2024-09-06 21:39:50 -05:00

TileEntityBroadcaster.java

Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.

2024-09-06 21:39:50 -05:00

TileEntityCharger.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityChimneyBase.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityChimneyBrick.java

an unspeakably large commit

2023-12-07 19:51:26 -05:00

TileEntityChimneyIndustrial.java

an unspeakably large commit

2023-12-07 19:51:26 -05:00

TileEntityChlorineSeal.java

…

TileEntityChungus.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityCondenser.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityCondenserPowered.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityConveyorPress.java

the ByteBuf shenanigans begin!!

2024-09-06 21:59:06 -05:00

TileEntityCore.java

the ByteBuf shenanigans begin!!

2024-09-06 21:59:06 -05:00

TileEntityCoreEmitter.java

the ByteBuf shenanigans begin!!

2024-09-06 21:59:06 -05:00

TileEntityCoreInjector.java

the ByteBuf shenanigans begin!!

2024-09-06 21:59:06 -05:00

TileEntityCoreReceiver.java

the ByteBuf shenanigans begin!!

2024-09-06 21:59:06 -05:00

TileEntityCoreStabilizer.java

the ByteBuf shenanigans begin!!

2024-09-06 21:59:06 -05:00

TileEntityCrucible.java

Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.

2024-09-06 21:39:50 -05:00

TileEntityCustomMachine.java

the ByteBuf shenanigans begin!!

2024-09-06 21:59:06 -05:00

TileEntityCyberCrab.java

removed more useless crap

2024-03-24 18:26:21 +01:00

TileEntityDecon.java

…

TileEntityDemonLamp.java

…

TileEntityDeuteriumExtractor.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityDeuteriumTower.java

i love to drink oil

2024-08-15 20:38:22 +02:00

TileEntityDiFurnace.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityDiFurnaceRTG.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityDummy.java

…

TileEntityElectrolyser.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityFEL.java

mass byte bufferization

2024-06-12 15:43:19 -07:00

TileEntityFF.java

…

TileEntityFireboxBase.java

mass byte bufferization

2024-06-12 15:43:19 -07:00

TileEntityForceField.java

Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.

2024-09-06 21:39:50 -05:00

TileEntityFoundryBase.java

…

TileEntityFoundryBasin.java

coca cola, dont forget the ice!

2024-01-10 18:13:46 -05:00

TileEntityFoundryCastingBase.java

desulfurized oils

2024-02-05 16:45:29 +01:00

TileEntityFoundryChannel.java

Channel and caster tweaks

2024-03-30 14:11:53 -04:00

TileEntityFoundryMold.java

coca cola, dont forget the ice!

2024-01-10 18:13:46 -05:00

TileEntityFoundryOutlet.java

Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.

2024-09-06 21:39:50 -05:00

TileEntityFoundrySlagtap.java

Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.

2024-09-06 21:39:50 -05:00

TileEntityFoundryTank.java

arc furnace recipe autogen

2024-05-22 16:46:20 +02:00

TileEntityFurnaceBrick.java

launch pad condensation for LOXY rockets

2024-02-14 15:38:25 +01:00

TileEntityFurnaceCombination.java

mass byte bufferization

2024-06-12 15:43:19 -07:00

TileEntityFurnaceIron.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityFurnaceSteel.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityGeiger.java

sowwy

2024-07-02 02:44:06 -05:00

TileEntityHadron.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityHadronDiode.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityHadronPower.java

Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.

2024-09-06 22:05:50 -05:00

TileEntityHatch.java

…

TileEntityHeatBoiler.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityHeatBoilerIndustrial.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityHeaterElectric.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityHeaterFirebox.java

…

TileEntityHeaterHeatex.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityHeaterOilburner.java

mass byte bufferization

2024-06-12 15:43:19 -07:00

TileEntityHeaterOven.java

…

TileEntityICF.java

Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.

2024-09-06 21:39:50 -05:00

TileEntityICFController.java

more ICF crap

2024-05-12 12:32:41 +02:00

TileEntityICFPress.java

fixes and tweaks

2024-06-16 23:37:10 +02:00

TileEntityICFStruct.java

guh

2024-08-02 23:43:19 +02:00

TileEntityITER.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityITERStruct.java

…

TileEntityLockableBase.java

the foxes have taken over, torex tweaks

2024-01-21 20:16:10 +01:00

TileEntityMachineAmgen.java

I will kill Horse Ronald Reagan when I become 23 years old

2024-04-10 16:10:55 +02:00

TileEntityMachineArcFurnace.java

Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.

2024-09-06 21:39:50 -05:00

TileEntityMachineArcFurnaceLarge.java

Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.

2024-09-06 21:39:50 -05:00

TileEntityMachineArcWelder.java

Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.

2024-09-06 21:39:50 -05:00

TileEntityMachineAssembler.java

fixes

2024-06-18 20:45:16 +02:00

TileEntityMachineAssemblerBase.java

power net: compromise edition

2024-04-19 15:21:43 +02:00

TileEntityMachineAssemfac.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityMachineAutocrafter.java

fixes, plushies

2024-08-05 00:47:32 +02:00

TileEntityMachineAutosaw.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityMachineCentrifuge.java

Added config options for centrifuge

2024-07-30 22:37:51 +02:00

TileEntityMachineChemfac.java

i love to drink oil

2024-08-15 20:38:22 +02:00

TileEntityMachineChemplant.java

Add ByteBuf string reader/writer, and migrate the biggest CPU time offenders to ByteBuf packets

2024-06-07 18:20:43 +10:00

TileEntityMachineChemplantBase.java

i love to drink oil

2024-08-15 20:38:22 +02:00

TileEntityMachineCombustionEngine.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityMachineCompressor.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityMachineCrystallizer.java

Electrolyzer Improvements part 1

2024-07-08 10:16:15 -04:00

TileEntityMachineCyclotron.java

fixes

2024-06-18 20:45:16 +02:00

TileEntityMachineDetector.java

enough for today, my head hurts

2024-04-05 14:51:36 +02:00

TileEntityMachineDiesel.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityMachineDrain.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityMachineElectricFurnace.java

mass byte bufferization

2024-06-12 15:43:19 -07:00

TileEntityMachineEPress.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityMachineExcavator.java

just fuck em

2024-08-07 00:11:18 +02:00

TileEntityMachineExposureChamber.java

I will kill Horse Ronald Reagan when I become 23 years old

2024-04-10 16:10:55 +02:00

TileEntityMachineFunnel.java

combinator funnel item caching

2024-06-24 16:29:49 +02:00

TileEntityMachineGasCent.java

Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.

2024-09-06 21:39:50 -05:00

TileEntityMachineHephaestus.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityMachineIGenerator.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityMachineKeyForge.java

…

TileEntityMachineLargeTurbine.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityMachineLPW2.java

lesbian ponies with weapons

2024-08-27 22:27:11 +02:00

TileEntityMachineMiningLaser.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityMachineMiniRTG.java

enough for today, my head hurts

2024-04-05 14:51:36 +02:00

TileEntityMachineMissileAssembly.java

Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.

2024-09-06 21:39:50 -05:00

TileEntityMachineMixer.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityMachineOreSlopper.java

Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.

2024-09-06 21:39:50 -05:00

TileEntityMachinePlasmaHeater.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityMachinePress.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityMachinePumpBase.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityMachinePumpElectric.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityMachinePumpSteam.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityMachineRadarLarge.java

radar fixes

2024-01-15 19:53:35 +01:00

TileEntityMachineRadarNT.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityMachineRadarScreen.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityMachineRadGen.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityMachineRadiolysis.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityMachineReactorBreeding.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityMachineRTG.java

Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.

2024-09-06 21:39:50 -05:00

TileEntityMachineSatDock.java

fixes, foxes, flixes

2024-03-25 14:38:29 +01:00

TileEntityMachineSatLinker.java

…

TileEntityMachineSchrabidiumTransmutator.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityMachineShredder.java

Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.

2024-09-06 21:39:50 -05:00

TileEntityMachineSiren.java

Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.

2024-09-06 21:39:50 -05:00

TileEntityMachineSolderingStation.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityMachineSPP.java

I will kill Horse Ronald Reagan when I become 23 years old

2024-04-10 16:10:55 +02:00

TileEntityMachineStrandCaster.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityMachineTeleporter.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityMachineTransformer.java

…

TileEntityMachineTurbine.java

Merge remote-tracking branch 'upstream/master' into machine-configs

2024-08-21 18:16:23 +02:00

TileEntityMachineTurbineGas.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityMachineTurbofan.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityMachineWoodBurner.java

mass byte bufferization

2024-06-12 15:43:19 -07:00

TileEntityMicrowave.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityMultiblock.java

…

TileEntityNukeFurnace.java

…

TileEntityPlasmaStruct.java

…

TileEntityPWRController.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityRadiobox.java

SISTOR! DID YOU USE ALL MY DIAMONDS TO MAKE JUKEBOXES?

2024-04-09 20:57:33 +02:00

TileEntityRadioRec.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityReactorControl.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityReactorResearch.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityReactorZirnox.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityRtgFurnace.java

…

TileEntitySawmill.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntitySILEX.java

an big slappy

2024-08-12 16:26:09 +02:00

TileEntitySolarBoiler.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntitySolarMirror.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntitySoyuzLauncher.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntitySoyuzStruct.java

…

TileEntitySteamEngine.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityStirling.java

holy shit im done (part 2)

2024-09-06 22:04:19 -05:00

TileEntityStorageDrum.java

i love to drink oil

2024-08-15 20:38:22 +02:00

TileEntityTesla.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityTowerLarge.java

Configuration options for ashpit, leviathan turbine and all condensers

2024-08-12 13:56:45 +02:00

TileEntityTowerSmall.java

Configuration options for ashpit, leviathan turbine and all condensers

2024-08-12 13:56:45 +02:00

TileEntityVaultDoor.java

Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.

2024-09-06 21:39:50 -05:00

TileEntityWasteDrum.java

…

TileEntityWatz.java

holy shit what the fuck am i smoking

2024-09-06 21:59:06 -05:00

TileEntityWatzStruct.java

…

TileEntityZirnoxDestroyed.java

Merge master into branch Optimization, intelliJ couldn't do it, so I did it myself.

2024-09-06 21:39:50 -05:00