update to version 2.18.0+232

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

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,

config/customloadingscreen.cfg

@@ -1,14 +1,24 @@
 # 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
  sample/rotating_cakes
  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.

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":{
+ }
+}

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