From 8dd2a88fc1f2f89944de09b230330af9a213a71b Mon Sep 17 00:00:00 2001 From: DrMangoTea Date: Wed, 25 Jun 2025 23:48:03 +0200 Subject: [PATCH] 1.0 --- .idea/modules.xml | 1 + .../Create-The_Factory_Must_Grow.main.iml | 10 +- .idea/workspace.xml | 107 +- gradle.properties | 8 +- run-data/logs/debug-1.log.gz | Bin 82140 -> 79288 bytes run-data/logs/debug-2.log.gz | Bin 81751 -> 83082 bytes run-data/logs/debug-3.log.gz | Bin 82624 -> 83352 bytes run-data/logs/debug-4.log.gz | Bin 5348 -> 82882 bytes run-data/logs/debug-5.log.gz | Bin 82409 -> 82568 bytes run-data/logs/debug.log | 19793 +++++++-------- run-data/logs/latest.log | 182 +- run/logs/debug-1.log.gz | Bin 61403 -> 115161 bytes run/logs/debug-2.log.gz | Bin 114650 -> 114978 bytes run/logs/debug-3.log.gz | Bin 114632 -> 113441 bytes run/logs/debug-4.log.gz | Bin 136238 -> 115533 bytes run/logs/debug-5.log.gz | Bin 117336 -> 115156 bytes run/logs/debug.log | 20274 ++++++++-------- run/logs/latest.log | 1016 +- run/options.txt | 56 +- run/usercache.json | 2 +- .../e54e4c34b4f65d271b7b9f53d4ba815125cff8b9 | 10 +- .../resources/assets/tfmg/lang/en_ud.json | 201 +- .../resources/assets/tfmg/lang/en_us.json | 201 +- .../minecraft/tags/blocks/mineable/axe.json | 12 +- .../tags/blocks/mineable/pickaxe.json | 60 +- src/main/java/com/drmangotea/tfmg/TFMG.java | 4 +- .../pipes/SigmaPipeAttachmentModel.java | 175 + .../pipes/TFMGPipeAttachmentModel.java | 82 +- .../content/decoration/pipes/TFMGPipes.java | 53 +- .../tanks/TFMGFluidTankRenderer.java | 3 +- .../tanks/steel/SteelFluidTankRenderer.java | 5 +- .../debug/DebugCinderBlockItem.java | 3 +- .../ElectricMotorBlockEntity.java | 9 + .../traffic_light/TrafficLightScrollSlot.java | 4 +- .../types/AbstractSmallEngineBlockEntity.java | 4 +- .../tfmg/content/items/ScrewdriverItem.java | 2 +- .../casting_basin/CastingBasinRenderer.java | 20 +- .../concrete_hose/ConcreteHoseVisual.java | 61 + .../machinery/vat/base/VatRenderer.java | 3 +- .../TFMGMechanicalCraftingRecipeGen.java | 4 +- .../TFMGSequencedAssemblyRecipeGen.java | 4 +- .../drmangotea/tfmg/recipes/jei/TFMGJei.java | 26 +- .../tfmg/registry/TFMGBlockEntities.java | 5 +- src/main/resources/META-INF/mods.toml | 6 + .../assets/tfmg/lang/default/interface.json | 8 +- .../assets/tfmg/lang/default/tooltips.json | 246 + .../tfmg/models/block/air_intake/frame.json | 8 +- .../tfmg/textures/item/steel_mechanism.png | Bin 282 -> 279 bytes .../crude_oil.json | 0 49 files changed, 22036 insertions(+), 20632 deletions(-) create mode 100644 src/main/java/com/drmangotea/tfmg/content/decoration/pipes/SigmaPipeAttachmentModel.java create mode 100644 src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseVisual.java rename {src/main/resources/data/tfmg/tfmg_engine_fuels => tfmg_engine_fuels}/crude_oil.json (100%) diff --git a/.idea/modules.xml b/.idea/modules.xml index 12b3007a..bfec3a3a 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -4,6 +4,7 @@ + \ No newline at end of file diff --git a/.idea/modules/Create-The_Factory_Must_Grow.main.iml b/.idea/modules/Create-The_Factory_Must_Grow.main.iml index 8a55adfc..bc662852 100644 --- a/.idea/modules/Create-The_Factory_Must_Grow.main.iml +++ b/.idea/modules/Create-The_Factory_Must_Grow.main.iml @@ -9,19 +9,15 @@ - FORGE - MIXIN MCP + MIXIN + FORGE 1 - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8d2d2136..e003e6d6 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,7 +4,11 @@