From be710fa76bb9532394f3d7390c45aeaf237b8e37 Mon Sep 17 00:00:00 2001 From: DrMangoTea Date: Mon, 12 May 2025 20:55:57 +0200 Subject: [PATCH] more stuff --- .idea/workspace.xml | 113 +- run/logs/debug-1.log.gz | Bin 103444 -> 74619 bytes run/logs/debug-2.log.gz | Bin 157819 -> 86363 bytes run/logs/debug-3.log.gz | Bin 120919 -> 84053 bytes run/logs/debug-4.log.gz | Bin 136865 -> 96456 bytes run/logs/debug-5.log.gz | Bin 115436 -> 88901 bytes run/logs/debug.log | 22259 ++++++++++------ run/logs/latest.log | 3606 ++- run/usercache.json | 2 +- .../electricity/base/ElectricBlockEntity.java | 33 +- .../electricity/base/ElectricBlockValues.java | 2 + .../electricity/base/ElectricalNetwork.java | 89 +- .../content/electricity/base/IElectric.java | 103 +- .../base/KineticElectricBlockEntity.java | 39 +- .../base/VoltageAlteringBlockEntity.java | 2 + .../ElectriciansWrenchItem.java | 15 +- .../cable_hub/CableHubBlockEntity.java | 5 +- .../cables/CableConnectorBlockEntity.java | 2 +- .../CopycatCableBlockEntity.java | 16 +- .../debug/DebugCinderBlockItem.java | 45 +- .../measurement/VoltMeterBlockEntity.java | 2 +- .../diode/ElectricDiodeBlockEntity.java | 39 +- .../ElectricMotorBlockEntity.java | 37 +- .../ElectricPumpBlockEntity.java | 12 +- .../ElectricSwitchBlockEntity.java | 3 +- .../transformer/TransformerBlockEntity.java | 40 +- .../base/AbstractEngineBlockEntity.java | 6 +- .../content/engines/base/EngineBlock.java | 1 + .../EngineControllerBlockEntity.java | 28 +- .../types/AbstractSmallEngineBlockEntity.java | 30 +- .../engines/upgrades/TransmissionUpgrade.java | 2 +- .../misc/winding_machine/SpoolItem.java | 8 +- .../ElectrodeHolderBlockEntity.java | 4 +- .../assets/tfmg/lang/default/interface.json | 1 + .../textures/block/cinderflourblock_top.png | Bin 467 -> 530 bytes 35 files changed, 18209 insertions(+), 8335 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e517abe3..26a65ffe 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,18 +4,8 @@