Commit 8c57a82
Submodule CTNH-Bio updated from 614b083 to eb8887e
Submodule CTNH-Core updated from 088337c to 920cbcf
Submodule CTNH-Energy updated 77 files
- dependencies.gradle+7-2
- gradle.properties+1-1
- src/generated/resources/assets/ctnhenergy/lang/en_ud.json+53-46
- src/generated/resources/assets/ctnhenergy/lang/en_us.json+53-46
- src/generated/resources/assets/ctnhenergy/lang/zh_cn.json+63-57
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/CTNHEnergy.java-4
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/api/CEPredicates.java+4-4
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/client/ClientProxy.java+4-4
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/CommonProxy.java+4-3
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/item/DynamoCardItem.java+2-4
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/item/EUCellStats.java+2-4
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/machine/PowerSubstationMachine.java+42-30
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/machine/energyhatch/MEEnergyInputConfigurator.java+4-4
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/machine/energyhatch/MEEnergyPartMachine.java+6-24
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/machine/energyhatch/MESubstationHatch.java+7-4
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/machine/iohatch/MEDualOutputConfigurator.java+4-4
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/machine/iohatch/MEDualOutputHatchPartMachine.java-9
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/machine/iohatch/MEStockingBusPartMachine.java-9
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/machine/iohatch/METagStockingBusPartMachine.java-10
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/machine/iohatch/TagFilterConfigurator.java+3-3
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/machine/patternbuffer/advanced/MEAdvancedPatternBufferPartMachine.java-8
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/machine/patternbuffer/advanced/MEAdvancedPatternBufferProxyPartMachine.java-10
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/machine/patternbuffer/standard/MEPatternBufferPartMachine.java-9
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/machine/patternbuffer/standard/MEPatternBufferProxyPartMachine.java+10-17
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/machine/patternbuffer/ultimate/MEUltimatePatternBufferPartMachine.java-9
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/machine/patternbuffer/ultimate/MEUltimatePatternBufferProxyPartMachine.java-6
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/me/MEMachineEUHandler.java+61-23
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/me/key/VoltageKey.java+1-1
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/me/parts/p2p/EUP2PTunnelPart.java+248
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/me/service/EnergyDistributeService.java+23-3
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/me/service/IEnergyDistributor.java+8-2
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/me/strategy/context/CarriedContextEU.java+8-6
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/quantumcomputer/cpu/VirtualCraftingCPULogic.java+2-3
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/common/quantumcomputer/machine/QuantumComputerMultiblockMachine.java+3-12
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/data/CEDatagen.java+1
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/data/lang/ChineseLangHandler.java+3
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/data/lang/EnglishLangHandler.java+4-1
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/event/ForgeEventHandler.java+2-3
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/integration/emi/CEEMIPlugin.java+15-1
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/integration/jade/AEDeviceEUProvider.java+134
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/integration/jade/CTNHEnergyJadePlugin.java+23
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/EUP2P/EUP2PMixin.java-19
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/ae2/CableBusContainerMixin.java+28
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/ae2/cpu/CraftingCpuLogicMixin.java+9-10
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/ae2/cpu/ElapsedTimeTrackerInvoker.java-16
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/ae2/cpu/ExecutingCraftingJobAccessor.java-31
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/ae2/cpu/TaskProgressAccessor.java-14
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/ae2/emi/AbstractRecipeHandlerMixin.java+4-2
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/ae2/emi/EmiUseCraftingRecipeHandlerMixin.java+6-6
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/ae2/energy/ChestBlockEntityMixin.java+101
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/ae2/energy/DriveBlockEntityMixin.java+127
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/ae2/energy/EnergyOverlayGridMixin.java+15
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/ae2/energy/EnergyServiceMixin.java-38
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/ae2/energy/InterfaceEnergyDistributorLogic.java+17
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/ae2/energy/MEInventoryHandlerMixin.java+33
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/ae2/energy/PatternProviderEnergyDistributorLogic.java+28-6
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/ae2/menu/AEBaseMenuAccessor.java-17
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/ae2/misc/MachineUpgradeInventoryAccessor.java-17
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/ae2/misc/PartPlacementMixin.java+15-12
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/ae2/patternprovider/PatternProviderLogicAccessor.java-13
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/ae2/patternprovider/PatternProviderMenuAccessor.java-13
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/ae2/patternprovider/PatternProviderTargetCacheMixin.java+4-2
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/aecs/CrystalSeedItemMixin.java+19
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/aecs/ResonatingPatternProviderLogicMixin.java+1-1
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/betterP2P/CommonProxyMixin.java+7-5
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/mixin/meRequester/RequestSlotMixin.java+33
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/registry/CECreativeModeTabs.java+4-4
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/registry/CEItems.java+49-39
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/registry/CEMachines.java+2-4
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/registry/CEMultiblock.java+146-216
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/utils/CEUtil.java+19-4
- src/main/java/tech/luckyblock/mcmod/ctnhenergy/utils/ResultReflection.java-76
- src/main/resources/META-INF/accesstransformer.cfg+22
- src/main/resources/assets/ae2/models/part/p2p/p2p_tunnel_eu.json+6
- src/main/resources/assets/ctnhenergy/models/item/eu_p2p_tunnel.json+6
- src/main/resources/assets/ctnhenergy/textures/item/eu.png
- src/main/resources/ctnhenergy.mixins.json+9-11
- src/main/java/com/ctnhlang/CN.java+1-1
- src/main/java/com/ctnhlang/Category.java+13
- src/main/java/com/ctnhlang/Domain.java+1-8
- src/main/java/com/ctnhlang/EN.java+1-1
- src/main/java/com/ctnhlang/IgnoreLang.java+11
- src/main/java/com/ctnhlang/Key.java+1-2
- src/main/java/com/ctnhlang/Lang.java+8
- src/main/java/com/ctnhlang/LangFactory.java+15
- src/main/java/com/ctnhlang/Prefix.java+1-2
- src/main/java/com/ctnhlang/Suffix.java+1-2
- src/main/java/com/ctnhlang/langprovider/LangKeyBuilder.java+208
- src/main/java/tech/vixhentx/mcmod/ctnhlib/CTNHLib.java-1
- src/main/java/tech/vixhentx/mcmod/ctnhlib/langprovider/Lang.java+19-35
- src/main/java/tech/vixhentx/mcmod/ctnhlib/langprovider/LangProcessUtils.java-168
- src/main/java/tech/vixhentx/mcmod/ctnhlib/langprovider/LangProcessor.java+125-125
- src/main/java/tech/vixhentx/mcmod/ctnhlib/langprovider/TranslatedLang.java-15
- src/main/java/tech/vixhentx/mcmod/ctnhlib/registrate/CNRegistrate.java+3-12
- src/main/java/tech/vixhentx/mcmod/ctnhlib/registrate/builders/CTNHMachineBuilder.java+2-1
- src/main/java/tech/vixhentx/mcmod/ctnhlib/registrate/builders/CTNHMultiblockMachineBuilder.java+7-294
- dependencies.gradle+2
- gradle.properties+1-1
- src/generated/resources/assets/ctpp/blockstates/kinetic_generator.json+4-61
- src/generated/resources/assets/ctpp/blockstates/test.json-114
- src/generated/resources/assets/ctpp/lang/en_ud.json+17-13
- src/generated/resources/assets/ctpp/lang/en_us.json+17-13
- src/generated/resources/assets/ctpp/lang/zh_cn.json+16-11
- src/generated/resources/assets/ctpp/models/block/machine/carbon_brushes.json+3-2
- src/generated/resources/assets/ctpp/models/block/machine/test.json-90
- src/generated/resources/assets/ctpp/models/block/machine/windmill_control_center.json+8-32
- src/generated/resources/assets/ctpp/models/item/test.json-3
- src/main/java/com/mo_guang/ctpp/CTPP.java-6
- src/main/java/com/mo_guang/ctpp/CTPPGTAddon.java+14
- src/main/java/com/mo_guang/ctpp/api/CTPPPredicates.java+46
- src/main/java/com/mo_guang/ctpp/api/pattern/CTPPBlockMaps.java+22
- src/main/java/com/mo_guang/ctpp/api/pattern/StaticBlockPattern.java+5-2
- src/main/java/com/mo_guang/ctpp/client/KineticMachineBlockEntityRenderer.java+38
- src/main/java/com/mo_guang/ctpp/common/CommonProxy.java+14-1
- src/main/java/com/mo_guang/ctpp/common/blockentity/KineticMachineBlockEntity.java+3-2
- src/main/java/com/mo_guang/ctpp/common/condition/MechanicalTierCondition.java+6-33
- src/main/java/com/mo_guang/ctpp/common/condition/RPMCondition.java+3-3
- src/main/java/com/mo_guang/ctpp/common/data/GTArmInteractionPointTypes.java+37
- src/main/java/com/mo_guang/ctpp/common/data/recipe/BoomOfCreateRecipes.java+1-1
- src/main/java/com/mo_guang/ctpp/common/data/recipe/DieselGeneratorRecipes.java+3
- src/main/java/com/mo_guang/ctpp/common/data/recipe/KineticGeneratorRecipes.java+5-4
- src/main/java/com/mo_guang/ctpp/common/kinetic/fan/acidwashing/AcidWashingProcessingType.java+1-1
- src/main/java/com/mo_guang/ctpp/common/kinetic/fan/breathing/BreathingFanProcessingType.java+1-1
- src/main/java/com/mo_guang/ctpp/common/machine/KineticWorkableTieredMachine.java-10
- src/main/java/com/mo_guang/ctpp/common/machine/NotifiableStressTrait.java-10
- src/main/java/com/mo_guang/ctpp/common/machine/SimpleKineticElectricWorkableMachine.java-9
- src/main/java/com/mo_guang/ctpp/common/machine/multiblock/BigDamMachine.java+5-45
- src/main/java/com/mo_guang/ctpp/common/machine/multiblock/ComplexRotatingMachine.java+2-5
- src/main/java/com/mo_guang/ctpp/common/machine/multiblock/KineticGeneratorMachine.java+113-22
- src/main/java/com/mo_guang/ctpp/common/machine/multiblock/KineticMultiblockMachine.java+22-8
- src/main/java/com/mo_guang/ctpp/common/machine/multiblock/KineticOutputMachine.java+3-3
- src/main/java/com/mo_guang/ctpp/common/machine/multiblock/KineticTurbineMachine.java+9-31
- src/main/java/com/mo_guang/ctpp/common/machine/multiblock/part/KineticPartMachine.java+34-9
- src/main/java/com/mo_guang/ctpp/common/machine/multiblock/part/MechanicalUpgradePartMachine.java-9
- src/main/java/com/mo_guang/ctpp/common/machine/multiblock/windmillController/WindMillControlMachine.java+10-49
- src/main/java/com/mo_guang/ctpp/common/machine/simple/CarbonBrushesGeneratorMachine.java+2-12
- src/main/java/com/mo_guang/ctpp/common/machine/simple/ElectricGearBoxMachine.java-8
- src/main/java/com/mo_guang/ctpp/common/recipe/builder/create/CompactingRecipeBuilder.java+126
- src/main/java/com/mo_guang/ctpp/common/recipe/builder/create/CrushingRecipeBuilder.java+146
- src/main/java/com/mo_guang/ctpp/common/recipe/builder/create/CuttingRecipeBuilder.java+126
- src/main/java/com/mo_guang/ctpp/common/recipe/builder/create/ItemApplicationRecipeBuilder.java+125
- src/main/java/com/mo_guang/ctpp/common/recipe/builder/create/MechanicalCraftingRecipeBuilder.java+226
- src/main/java/com/mo_guang/ctpp/common/recipe/builder/create/MillingRecipeBuilder.java+146
- src/main/java/com/mo_guang/ctpp/common/recipe/builder/create/MixingRecipeBuilder.java+185
- src/main/java/com/mo_guang/ctpp/common/recipe/builder/create/SequencedAssemblyRecipeBuilder.java+298
- src/main/java/com/mo_guang/ctpp/common/recipe/builder/create/SplashingRecipeBuilder.java+141
- src/main/java/com/mo_guang/ctpp/data/CTPPDatagen.java+6-5
- src/main/java/com/mo_guang/ctpp/dynamicPart/rotation/IRotationMultiblock.java+59
- src/main/java/com/mo_guang/ctpp/dynamicPart/rotation/SimpleRotatingContraptionEntity.java+5
- src/main/java/com/mo_guang/ctpp/integration/emi/CTPPEmiPlugin.java-33
- src/main/java/com/mo_guang/ctpp/lang/ChineseLangHandler.java+5-7
- src/main/java/com/mo_guang/ctpp/lang/EnglishLangHandler.java+7-8
- src/main/java/com/mo_guang/ctpp/mixin/create/fix/SequencedAssemblyCategoryMixin.java+15
- src/main/java/com/mo_guang/ctpp/registry/CTPPItems.java+28
- src/main/java/com/mo_guang/ctpp/registry/CTPPMachines.java+11-7
- src/main/java/com/mo_guang/ctpp/registry/CTPPMultiblockMachines.java+309-185
- src/main/resources/assets/ctpp/textures/block/multiblock/windmill_control_center/overlay_front.png
- src/main/resources/assets/ctpp/textures/block/multiblock/windmill_control_center/overlay_front_active.png
- src/main/resources/assets/ctpp/textures/block/multiblock/windmill_control_center/overlay_front_active.png.mcmeta+6
- src/main/resources/assets/ctpp/textures/item/double_blaze_cake.png
- src/main/resources/assets/ctpp/textures/item/incomplete_steel_mechanism.png
- src/main/resources/ctpp.mixins.json+1
Submodule GregTech-Modern updated 519 files
0 commit comments