diff --git a/CHANGELOG.md b/CHANGELOG.md index 33abb2e..8ddde29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ -2.17.0+228 +2.18.0+232 +• update mod Custom Loading Screen +• update mod Extra CPUs • update mod Floralis +• update mod JAOPCA +• update mod More Electric Tools +• update mod Myst Library +• update mod Mystical Lib +• update mod Tesla Core Lib +• update config Custom Loading Screen • update config Custom Main Menu +• update config More Electric Tools diff --git a/config/CustomMainMenu/mainmenu.json b/config/CustomMainMenu/mainmenu.json index ff19917..db389a0 100644 --- a/config/CustomMainMenu/mainmenu.json +++ b/config/CustomMainMenu/mainmenu.json @@ -113,7 +113,7 @@ "modcounts": { - "text" : "MC 1.12.2 - ET 2.17.0+228. 170 modifications.", + "text" : "MC 1.12.2 - ET 2.18.0+232. 170 modifications.", "posX" : 2, "posY" : -10, "color" : -1, diff --git a/config/customloadingscreen.cfg b/config/customloadingscreen.cfg index 1d35e43..2638f97 100644 --- a/config/customloadingscreen.cfg +++ b/config/customloadingscreen.cfg @@ -1,6 +1,13 @@ # Configuration file +debug { + B:resource_loading=false +} + + general { + # The maximum fps to target for the loading screen. The default is 75. Values between 2 and 300 are allowed. + I:fps_limit=75 S:random_configs < sample/default sample/white @@ -8,7 +15,10 @@ general { sample/scrolling > - # Sets the config to use for the custom loading screen. Use 'builtin/random' for a random loading screen on each load + # Sets the config to use for the custom loading screen. Use 'builtin/random' for a random loading screen on each load. + # Alternatively you can prefix this with 'config/' to load from the 'config/customloadingscreen/' directory. + # Or you can use 'sample/slideshow' to display images from config/customloadingscreen/slideshow_#.png. + # Or you can set this to 'config/example' to use the default example config. S:screen_config=config # Sleep for a tiny amount of time each mod progress stage to make configs that rely on receiving all mod load stages work a bit better. diff --git a/config/customloadingscreen/example.json b/config/customloadingscreen/example.json new file mode 100644 index 0000000..ae4145e --- /dev/null +++ b/config/customloadingscreen/example.json @@ -0,0 +1,126 @@ +{ + "renders": [ + { + "image": { + "parent": "builtin/panorama", + "image": "textures/gui/title/background/panorama_x.png" + } + }, + { + "image": { + "parent": "builtin/image", + "image": "customloadingscreen:textures/generic/darkened_blur_horizontal_strip.png", + "position_type": "CENTER", + "offset_pos": "CENTER", + "position": { + "x": "0", + "y": "0", + "width": "screen_width", + "height": "100" + }, + "texture": { + "x": "0", + "y": "0", + "width": "1", + "height": "1" + } + } + }, + { + "image": { + "parent":"builtin/image", + "image": "customloadingscreen:textures/progress_bars.png", + "position_type": "CENTER", + "offset_pos": "CENTER", + "position":{ + "x": "0", + "y":"20", + "width":"182 * 2", + "height":"20" + }, + "texture":{ + "x": "0", + "y": "70 / 256.0", + "width": "182 / 256.0", + "height": "10 / 256.0" + } + } + }, + { + "image": { + "parent": "builtin/image", + "image": "customloadingscreen:textures/progress_bars.png", + "position_type": "CENTER", + "offset_pos": "CENTER", + "position":{ + "x":"percentage * 182 - 182", + "y":"20", + "width":"percentage * 182 * 2", + "height":"20" + }, + "texture":{ + "x":"0", + "y":"80 / 256.0", + "width": "percentage * 182 / 256.0", + "height":"10 / 256.0" + } + } + }, + { + "image": { + "parent": "builtin/text", + "image": "textures/font/ascii.png", + "position_type": "CENTER", + "offset_pos": "CENTER", + "text": "is_reloading ? status : (status + ': ' + sub_status)", + "position": { + "x": "0", + "y": "-20", + "width": "0", + "height": "0" + }, + "colour":"0xFF_FF_FF_FF" + } + }, + { + "image": { + "parent": "builtin/text", + "image": "textures/font/ascii.png", + "position_type": "CENTER", + "offset_pos": "CENTER", + "text": "is_reloading ? sub_status : ''", + "position": { + "x": "0", + "y": "0", + "width": "0", + "height": "0" + }, + "colour":"0xFF_FF_FF_FF" + } + }, + { + "image": { + "parent": "builtin/text", + "image": "textures/font/ascii.png", + "position_type": "CENTER", + "offset_pos": "CENTER", + "text": "(floor(percentage * 100)) + '%'", + "position": { + "x": "0", + "y": "-10", + "width": "0", + "height": "0" + }, + "colour":"0xFF_FF_FF_FF" + } + } + ], + "functions":[ + ], + "factories":[ + ], + "actions":[ + ], + "variables":{ + } +} diff --git a/config/customloadingscreen/lang/lang b/config/customloadingscreen/lang/lang new file mode 100644 index 0000000..e69de29 diff --git a/config/customloadingscreen_timings.nbt b/config/customloadingscreen_timings.nbt index 8497b48..f623cca 100644 Binary files a/config/customloadingscreen_timings.nbt and b/config/customloadingscreen_timings.nbt differ diff --git a/config/customloadingscreen_tips.txt b/config/customloadingscreen_tips.txt new file mode 100644 index 0000000..e69de29 diff --git a/config/mets.cfg b/config/mets.cfg index 67b4873..dd8b128 100644 --- a/config/mets.cfg +++ b/config/mets.cfg @@ -4,6 +4,7 @@ general { D:AdvancedElectricSubmachineGunCost=5000.0 D:AdvancedIridiumSwordBaseAttackDamage=25.0 D:AdvancedIridiumSwordBaseCost=800.0 + D:AdvancedLaserTowerCost=2500.0 D:AdvancedQuantumSuitCureCost=30000.0 D:AdvancedQuantumSuitDamageEnergyCost=10000.0 D:ElectricFirstAidLifeSupport=10000.0 @@ -12,6 +13,7 @@ general { D:ElectricRocketLauncherCost=50000.0 I:ElectricRocketLauncherInterval=1500 D:ElectricSubmachineGunCost=100.0 + B:EnableEUSlashBladeRecipe=true B:EnableElectricFirstAidLifeSupportRecipe=true B:EnableElectricNutritionSupplyCost=true B:EnableFastTESR=false @@ -20,6 +22,7 @@ general { B:EnableOreGenerate=true D:ForceFieldCost=5000.0 D:HeavyQuantumSuitDamageEnergyCost=10000.0 + D:LaserTowerCost=250.0 D:NanoBowBaseCost=300.0 D:NanoBowMaxVelocity=5.0 D:PlasmaAirCannonBaseCost=1000.0 diff --git a/mods/Floralis-1.12.2-1.8.0.jar b/mods/Floralis-1.12.2-1.9.0.jar similarity index 81% rename from mods/Floralis-1.12.2-1.8.0.jar rename to mods/Floralis-1.12.2-1.9.0.jar index cceca47..5bbe224 100644 Binary files a/mods/Floralis-1.12.2-1.8.0.jar and b/mods/Floralis-1.12.2-1.9.0.jar differ diff --git a/mods/JAOPCA-1.12.2-2.2.8.105.jar b/mods/JAOPCA-1.12.2-2.2.8.106.jar similarity index 87% rename from mods/JAOPCA-1.12.2-2.2.8.105.jar rename to mods/JAOPCA-1.12.2-2.2.8.106.jar index b56e65c..7c500ca 100644 Binary files a/mods/JAOPCA-1.12.2-2.2.8.105.jar and b/mods/JAOPCA-1.12.2-2.2.8.106.jar differ diff --git a/mods/LoadingScreen-1.12.2-1.4.1.jar b/mods/LoadingScreen-1.12.2-1.4.1.jar deleted file mode 100644 index 055f065..0000000 Binary files a/mods/LoadingScreen-1.12.2-1.4.1.jar and /dev/null differ diff --git a/mods/LoadingScreen-1.12.2-1.5.6.jar b/mods/LoadingScreen-1.12.2-1.5.6.jar new file mode 100644 index 0000000..693d8a7 Binary files /dev/null and b/mods/LoadingScreen-1.12.2-1.5.6.jar differ diff --git a/mods/MoreElectricTools.v1.64.jar b/mods/MoreElectricTools.v1.661.jar similarity index 52% rename from mods/MoreElectricTools.v1.64.jar rename to mods/MoreElectricTools.v1.661.jar index d824def..fc31ec6 100644 Binary files a/mods/MoreElectricTools.v1.64.jar and b/mods/MoreElectricTools.v1.661.jar differ diff --git a/mods/extracpus-1.12.2-1.1.0.jar b/mods/extracpus-1.12.2-1.1.0.jar deleted file mode 100644 index 7a20449..0000000 Binary files a/mods/extracpus-1.12.2-1.1.0.jar and /dev/null differ diff --git a/mods/extracpus-1.12.2-1.2.1.jar b/mods/extracpus-1.12.2-1.2.1.jar new file mode 100644 index 0000000..9d9e42b Binary files /dev/null and b/mods/extracpus-1.12.2-1.2.1.jar differ diff --git a/mods/mysticallib-1.12.2-1.10.0.jar b/mods/mysticallib-1.12.2-1.13.0.jar similarity index 78% rename from mods/mysticallib-1.12.2-1.10.0.jar rename to mods/mysticallib-1.12.2-1.13.0.jar index 24d2fe9..eb7341d 100644 Binary files a/mods/mysticallib-1.12.2-1.10.0.jar and b/mods/mysticallib-1.12.2-1.13.0.jar differ diff --git a/mods/mystlibrary-1.12.2-0.0.3.0.jar b/mods/mystlibrary-1.12.2-0.0.3.1.jar similarity index 74% rename from mods/mystlibrary-1.12.2-0.0.3.0.jar rename to mods/mystlibrary-1.12.2-0.0.3.1.jar index 28d7b14..400e1af 100644 Binary files a/mods/mystlibrary-1.12.2-0.0.3.0.jar and b/mods/mystlibrary-1.12.2-0.0.3.1.jar differ diff --git a/mods/tesla-core-lib-1.12.2-1.0.17.jar b/mods/tesla-core-lib-1.12.2-1.0.18.jar similarity index 75% rename from mods/tesla-core-lib-1.12.2-1.0.17.jar rename to mods/tesla-core-lib-1.12.2-1.0.18.jar index 7651064..8163a30 100644 Binary files a/mods/tesla-core-lib-1.12.2-1.0.17.jar and b/mods/tesla-core-lib-1.12.2-1.0.18.jar differ