diff --git a/CHANGELOG.md b/CHANGELOG.md index ce8cc66..3d9c378 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,18 @@ -2.22.0+240 +2.23.0+242 -• add mod Energy Meters -• add mod Reconstructor -• add mod Super Sound Muffler: Revived +• add mod AE2 Utilities +• add mod Mixin Booter -• update mod Cleanse +• update mod Combo Armors +• update mod Dimensional Doors +• update mod Energy Control • update mod Floralis +• update mod Hammer Lib +• update mod Myst Library • update mod Not Enough Energistics -• add config Reconstructor -• add config Super Sound Muffler: Revived +• add config Agricraft • update config Custom Main Menu +• update config Energy Control • update config Not Enough Energistics diff --git a/config/CustomMainMenu/mainmenu.json b/config/CustomMainMenu/mainmenu.json index 1da94bd..73c5cbe 100644 --- a/config/CustomMainMenu/mainmenu.json +++ b/config/CustomMainMenu/mainmenu.json @@ -113,7 +113,7 @@ "modcounts": { - "text" : "MC 1.12.2 - ET 2.22.1+240. 173 modifications.", + "text" : "MC 1.12.2 - ET 2.23.0+242. 175 modifications.", "posX" : 2, "posY" : -10, "color" : -1, diff --git a/config/NotEnoughEnergistics.cfg b/config/NotEnoughEnergistics.cfg index c51765d..5bd9bcf 100644 --- a/config/NotEnoughEnergistics.cfg +++ b/config/NotEnoughEnergistics.cfg @@ -1,36 +1,49 @@ # Configuration file +helper { + # If true, Crafting Helper will match other items even they can't auto-crafting [default: true] + B:matchOtherItems=true +} + + +other { + # If true, it will make all similar ingredient switch at the same time. [default: true] + B:allowSynchronousSwitchIngredient=true +} + + transfer { - # Automatic switch Pattern Terminal's Mode when click [+].Default:true B:allowAutomaticSwitchPatternTerminalMode=true - # If true, print current recipe type in log.Default:false + # If true, print current recipe type in log.Default:false [default: false] B:allowPrintRecipeType=false - - # If true, it will make all similar ingredient switch at the same time B:allowSynchronousSwitchIngredient=true - - # If true, it will open a gui to set craft amount after ctrl + click [+] button B:enableCraftAmountSettingGui=true # If item in the blacklist, it will not be transferred. - # example:{"itemName":"gregtech:meta_item_2","meta":"32492"} + # example:{"itemName":"gregtech:meta_item_2","meta":"32492"} [default: ] S:itemBlacklist < > + # Item Combination Mode Setting, here are all the modes. + # "ENABLED" "DISABLED" WHITELIST [default: ENABLED] + S:itemCombinationMode=ENABLED + + # Whitelist for item combination [default: ] + S:itemCombinationWhitelist < + > + # If item in tne priority list, it will be transferred first. - # example:{"itemName":"gregtech:meta_item_2","meta":"32492"} + # example:{"itemName":"gregtech:meta_item_2","meta":"32492"} [default: ] S:itemPriorityList < > - - # If true, Crafting Helper will match other items even they can't auto-crafting B:matchOtherItems=true - # If oredict has this mod's item, use it first. + # If oredict has this mod's item, use it first. [default: ] S:modPriorityList < > - # If true, the ingredient currently displayed by JEI will be transferred.Default:false + # If true, the ingredient currently displayed by JEI will be transferred.Default:false [default: false] B:useDisplayedIngredient=true } diff --git a/config/agricraft.cfg b/config/agricraft.cfg new file mode 100644 index 0000000..a452a5a --- /dev/null +++ b/config/agricraft.cfg @@ -0,0 +1,8 @@ +# Configuration file + +debug { + # Set to true if you wish to enable debug mode + B:debug=false +} + + diff --git a/config/energycontrol.cfg b/config/energycontrol.cfg index a6b6c8f..1928062 100644 --- a/config/energycontrol.cfg +++ b/config/energycontrol.cfg @@ -1,29 +1,39 @@ # Configuration file general { - # [range: 0 ~ 512, default: 256] I:SMPMaxAlarmRange=256 - - # [default: default,sci-fi,siren] + I:alarmPause=60 S:allowedAlarms=default,sci-fi,siren + B:disableRangeCheck=false - # [range: 0 ~ 256, default: 64] + # Min: 0 + # Max: 256 I:howlerAlarmRange=64 - # [range: 0 ~ 2000, default: 20] + # Min: 0 + # Max: 2000 I:infoPanelRefreshPeriod=20 - # [range: 0 ~ 256, default: 128] + # Min: 0 + # Max: 256 I:maxAlarmRange=128 - # [range: 0 ~ 2000, default: 20] + # Min: 0 + # Max: 2000 I:rangeTriggerRefreshPeriod=20 - - # [range: 0 ~ 1000, default: 1] I:remoteThermalMonitorEnergyConsumption=1 + B:showOreInfo=true - # [default: false] + # Min: 0 + # Max: 2000 + I:thermalMonitorRefreshPeriod=20 B:useCustomSounds=false + B:wsEnabled=false + S:wsHost= + I:wsPort=0 + I:wsRefreshRate=100 + S:wsServerID=d730ef1e-68a2-4fc9-aa82-42edcd95aae0 + S:wsToken=78c2b80a-1203-43fd-a9af-75cec29f5acf } diff --git a/mods/!mixinbooter-4.2.jar b/mods/!mixinbooter-4.2.jar new file mode 100644 index 0000000..837e9e2 Binary files /dev/null and b/mods/!mixinbooter-4.2.jar differ diff --git a/mods/AE2Utilities-1.12.2-0.2.jar b/mods/AE2Utilities-1.12.2-0.2.jar new file mode 100644 index 0000000..7a13781 Binary files /dev/null and b/mods/AE2Utilities-1.12.2-0.2.jar differ diff --git a/mods/ComboArmors-1.12.2-0.0.6.jar b/mods/ComboArmors-1.12.2-0.0.9.jar similarity index 68% rename from mods/ComboArmors-1.12.2-0.0.6.jar rename to mods/ComboArmors-1.12.2-0.0.9.jar index b291ca5..7f8d2ac 100644 Binary files a/mods/ComboArmors-1.12.2-0.0.6.jar and b/mods/ComboArmors-1.12.2-0.0.9.jar differ diff --git a/mods/DimensionalDoors-1.12.2-3.1.2-UNOFFICIAL.jar b/mods/DimensionalDoors-3.0.9-288.jar similarity index 71% rename from mods/DimensionalDoors-1.12.2-3.1.2-UNOFFICIAL.jar rename to mods/DimensionalDoors-3.0.9-288.jar index 9d61270..0f9a958 100644 Binary files a/mods/DimensionalDoors-1.12.2-3.1.2-UNOFFICIAL.jar and b/mods/DimensionalDoors-3.0.9-288.jar differ diff --git a/mods/EnergyControl-1.12.2-0.1.16.jar b/mods/EnergyControl-1.12.2-0.1.16.jar deleted file mode 100644 index b6a20a6..0000000 Binary files a/mods/EnergyControl-1.12.2-0.1.16.jar and /dev/null differ diff --git a/mods/EnergyControl-1.12.2-0.2.8.jar b/mods/EnergyControl-1.12.2-0.2.8.jar new file mode 100644 index 0000000..0eba32c Binary files /dev/null and b/mods/EnergyControl-1.12.2-0.2.8.jar differ diff --git a/mods/Floralis-1.12.2-1.11.0.jar b/mods/Floralis-1.12.2-1.12.0.jar similarity index 78% rename from mods/Floralis-1.12.2-1.11.0.jar rename to mods/Floralis-1.12.2-1.12.0.jar index b51b586..15d3a5f 100644 Binary files a/mods/Floralis-1.12.2-1.11.0.jar and b/mods/Floralis-1.12.2-1.12.0.jar differ diff --git a/mods/HammerLib-1.12.2-2.0.6.31.jar b/mods/HammerLib-1.12.2-2.0.6.32.jar similarity index 72% rename from mods/HammerLib-1.12.2-2.0.6.31.jar rename to mods/HammerLib-1.12.2-2.0.6.32.jar index 5dcbe63..79fd8f9 100644 Binary files a/mods/HammerLib-1.12.2-2.0.6.31.jar and b/mods/HammerLib-1.12.2-2.0.6.32.jar differ diff --git a/mods/NotEnoughEnergistics-1.12.2-1.2.1.jar b/mods/NotEnoughEnergistics-1.12.2-1.2.4.jar similarity index 54% rename from mods/NotEnoughEnergistics-1.12.2-1.2.1.jar rename to mods/NotEnoughEnergistics-1.12.2-1.2.4.jar index ffc8a45..908796f 100644 Binary files a/mods/NotEnoughEnergistics-1.12.2-1.2.1.jar and b/mods/NotEnoughEnergistics-1.12.2-1.2.4.jar differ diff --git a/mods/mystlibrary-1.12.2-0.0.3.1.jar b/mods/mystlibrary-1.12.2-0.0.3.2.jar similarity index 84% rename from mods/mystlibrary-1.12.2-0.0.3.1.jar rename to mods/mystlibrary-1.12.2-0.0.3.2.jar index 400e1af..5249060 100644 Binary files a/mods/mystlibrary-1.12.2-0.0.3.1.jar and b/mods/mystlibrary-1.12.2-0.0.3.2.jar differ