Update mods

smcmo · Apr 2, 2021 · 2ce492e · 2ce492e
1 parent 9adc627
commit 2ce492e
Show file tree

Hide file tree

Showing 29 changed files with 89 additions and 84 deletions.
diff --git a/config/B3M.cfg b/config/B3M.cfg
@@ -1,5 +1,5 @@
 # Вращение Земли Майнкрафтская 1.12.2
-# Fri 29 Jan 2021 16:45:27 CST
+# Fri 02 Apr 2021 11:26:05 CDT
 
 TimeMultiplier: 2
 SystemTime: no

diff --git a/config/betterhurttimer.cfg b/config/betterhurttimer.cfg
@@ -25,20 +25,20 @@ general {
             I:armorResistantTime=5
 
             # Damage sources that need a specific iFrame.
-            #
+            # 
             # Format: [*Damage Source name (Regex)]:[*Should damage stack between iFrames]:[*iFrame time]
             # * Damage Source name -> Used to identify the type of damage you're receiving.
             # * Should damage stack between iFrames -> 'true' or 'false', when set to 'true' damage will always stack regardless of the iFrame, but it will only apply the damage every iFrame.
             # * iFrame time -> How often you can receive damage from this damage source.
-            #
-            #
+            # 
+            # 
             # Examples:
             # - inFire:false:10 -> Source 'inFire' does not stack and only allows hits every 10 game ticks.
             # - inFire|lava:false:10 -> Sources 'inFire' or 'lava' do not stack and only allows hits every 10 game ticks (lava and fire will share the same iFrame).
             # - arrow:true:10 - > Source 'arrow' does stack and hits the accumulated damage every 10 game ticks.
-            #
+            # 
             # # If the next attack deals more than the previous the difference is applied
-            #
+            # 
             S:damageSource <
                 ^inFire$:false:10
                 ^lightningBolt$:false:10
@@ -90,24 +90,24 @@ general {
 
         attackframes {
             # Damage Sources from direct hits.
-            #
+            # 
             # Example: Players and Mobs melee Damage Source.
-            #
+            # 
             S:attackSources <
                 player
                 mob
              >
 
             # Mobs that need a specific attack threshold.
-            #
+            # 
             # Format: [*mod:entity]:[*Attack threshold]
             # * mod:entity -> Id of the entity in-game.
             # * Attack threshold -> Attack reload speed before the attack is canceled.
-            #
-            #
+            # 
+            # 
             # Example:
             # - minecraft:slime:1 -> 'Slime' from mod 'Minecraft' will only be able to attack when its attack reload time is 100%.
-            #
+            # 
             S:attackThreshold <
                 minecraft:slime:1
                 tconstruct:blueslime:1
@@ -125,18 +125,18 @@ general {
             D:attackThresholdPlayer=0.5
 
             # Items that need a specific attack reload speed. [Overwrites mob specific attack threshold]
-            #
+            # 
             # Format: [*mod:item)]:[*attack reload speed]
             # * Item Source name -> Used to identify the item used.
             # * attack reload speed -> Attack reload speed before the attack is canceled.
-            #
-            #
+            # 
+            # 
             # Examples:  (when attack threshold is 1)
             # - minecraft:iron_axe:2 -> Iron Axe can never attack.
             # - minecraft:iron_axe:1 -> Iron Axe can only attack when fully up.
             # - minecraft:iron_axe:0.5 -> Iron Axe can only attack when more than halfway up.
             # - minecraft:iron_axe:0 -> Iron Axe can always attack.
-            #
+            # 
             S:itemSource <
              >
         }
@@ -177,3 +177,5 @@ general {
     }
 
 }
+
+
diff --git a/config/customloadingscreen_timings.nbt b/config/customloadingscreen_timings.nbt
diff --git a/config/cyberware.cfg b/config/cyberware.cfg
@@ -1,160 +1,126 @@
 # Configuration file
 
 defaults {
+    # Use format 'id amount metadata' [default: [cyberware:body_part 1 8], [cyberware:body_part 1 9]]
     S:"Default augments for arm slot" <
         cyberware:body_part 1 8
         cyberware:body_part 1 9
      >
+
+    # Use format 'id amount metadata' [default: [cyberware:body_part 1 7]]
     S:"Default augments for bone slot" <
         cyberware:body_part 1 7
      >
+
+    # Use format 'id amount metadata' [default: [cyberware:body_part 1 1]]
     S:"Default augments for cranium slot" <
         cyberware:body_part 1 1
      >
+
+    # Use format 'id amount metadata' [default: [cyberware:body_part 1 0]]
     S:"Default augments for eyes slot" <
         cyberware:body_part 1 0
      >
+
+    # Use format 'id amount metadata' [default: ]
     S:"Default augments for foot slot" <
      >
+
+    # Use format 'id amount metadata' [default: ]
     S:"Default augments for hand slot" <
      >
+
+    # Use format 'id amount metadata' [default: [cyberware:body_part 1 2]]
     S:"Default augments for heart slot" <
         cyberware:body_part 1 2
      >
+
+    # Use format 'id amount metadata' [default: [cyberware:body_part 1 10], [cyberware:body_part 1 11]]
     S:"Default augments for leg slot" <
         cyberware:body_part 1 10
         cyberware:body_part 1 11
      >
+
+    # Use format 'id amount metadata' [default: [cyberware:body_part 1 4]]
     S:"Default augments for lower_organs slot" <
         cyberware:body_part 1 4
      >
+
+    # Use format 'id amount metadata' [default: [cyberware:body_part 1 3]]
     S:"Default augments for lungs slot" <
         cyberware:body_part 1 3
      >
+
+    # Use format 'id amount metadata' [default: [cyberware:body_part 1 6]]
     S:"Default augments for muscle slot" <
         cyberware:body_part 1 6
      >
+
+    # Use format 'id amount metadata' [default: [cyberware:body_part 1 5]]
     S:"Default augments for skin slot" <
         cyberware:body_part 1 5
      >
 }
 
 
 essence {
-    #  [range: 0 ~ 2147483647, default: 25]
     I:"Critical Essence value, where rejection begins"=25
-
-    #  [range: 0 ~ 2147483647, default: 100]
     I:"Maximum Essence"=100
 }
 
 
 gamerules {
-    # If dropCyberware enabled, chance for a piece of Cyberware to successfuly drop instead of being destroyed. [range: 0.0 ~ 100.0, default: 100.0]
     S:"Chance of successful drop"=100.0
-
-    # Determines if players drop their Cyberware on death. Does not change settings on existing worlds, use /gamerule for that. Overridden if cyberware_keepCyberware is true [default: false]
     B:"Default for gamerule cyberware_dropCyberware"=false
-
-    # Determines if players keep their Cyberware between lives. Does not change settings on existing worlds, use /gamerule for that. [default: false]
     B:"Default for gamerule cyberware_keepCyberware"=false
 }
 
 
 hud {
-    #  [range: 0.0 ~ 100.0, default: 0.05]
     S:"Amount hudjack HUD will 'float' with movement. Set to 0 for no float."=0.05
-
-    #  [range: 0.0 ~ 100.0, default: 0.1]
     S:"Amount hudlens HUD will 'float' with movement. Set to 0 for no float."=0.1
-
-    # Experimental, defaults to false. [default: false]
     B:"Enable hudlens and hudjack float."=false
 }
 
 
 integration {
-    # Requires Botania [default: true]
     B:"Enable Botania Integration if the mod is Loaded"=true
-
-    # Requires EnderIO [default: true]
     B:"Enable EnderIO Integration if the mod is Loaded"=true
-
-    # Requires Matter Overdrive [default: true]
     B:"Enable Matter Overdrive Integration if the mod is Loaded"=true
-
-    # Requires Tough as Nails [default: true]
     B:"Enable Tough As Nails Integration if the mod is Loaded"=true
 }
 
 
 machines {
-    #  [range: 0.0 ~ 100.0, default: 10.0]
     S:"Additive chance for Scanner per extra item"=10.0
-
-    #  [range: 0.0 ~ 100.0, default: 15.0]
     S:"Chance of blueprint from Engineering Table"=15.0
-
-    #  [range: 0.0 ~ 100.0, default: 10.0]
     S:"Chance of blueprint from Scanner"=10.0
-
-    # 24000 is one Minecraft day, 1200 is one real-life minute [range: 0 ~ 2147483647, default: 24000]
     I:"Ticks taken per Scanner operation"=24000
 }
 
 
 mobs {
-    #  [default: true]
     B:"Add Cyberware clothing to mobs"=true
-
-    #  [default: true]
     B:"CyberZombies are enabled"=true
-
-    # Vanilla Zombie = 4, Enderman = 4, Witch = 1 [range: 0 ~ 2147483647, default: 1]
     I:"CyberZombies maximum pack size"=1
-
-    # Vanilla Zombie = 4, Enderman = 1, Witch = 1 [range: 0 ~ 2147483647, default: 1]
     I:"CyberZombies minimum pack size"=1
-
-    # Vanilla Zombie = 100, Enderman = 10, Witch = 5 [range: 0 ~ 2147483647, default: 15]
     I:"CyberZombies spawning weight"=15
-
-    #  [default: true]
     B:"Dimension ids applies to beacon, radio & cranial broadcaster?"=true
-
-    #  [default: true]
     B:"Dimension ids applies to natural spawning?"=true
-
-    #  [default: true]
     B:"Dimension ids is a blacklist?"=true
     I:"Dimensions ids" <
      >
-
-    #  [range: 0.0 ~ 100.0, default: 50.0]
     S:"Percent chance a CyberZombie drops a cyberware"=50.0
-
-    #  [range: 0.0 ~ 100.0, default: 50.0]
     S:"Percent chance a Cyberware clothing is dropped"=50.0
 }
 
 
 other {
-    #  [range: 1 ~ 3, default: 2]
     I:"Configure the mining level for the reinforced fist"=2
-
-    #  [default: true]
     B:"Enable Katana"=true
-
-    #  [default: true]
     B:"Enable Trench Coat, Mirror Shades, and Biker Jacket"=true
-
-    #  [default: true]
     B:"Enable changes to player model (missing skin, missing limbs, Cybernetic limbs)"=true
-
-    # Normally only found in Nether fortresses [default: false]
     B:"Enable crafting recipe for Robosurgeon"=false
-
-    #  [range: 0 ~ 2147483647, default: 1]
     I:"RF/Tesla per internal power unit"=1
 }
 

diff --git a/config/konkrete/locals/en_us.local b/config/konkrete/locals/en_us.local
@@ -15,3 +15,5 @@ popup.choosefile.title = Choose File
 popup.choosefile.choose = Choose
 popup.choosefile.supported = Supported file types:
 
+configscreen.boolean.enabled = Enabled
+configscreen.boolean.disabled = Disabled
diff --git a/config/randomtweaks/randomtweaks.cfg b/config/randomtweaks/randomtweaks.cfg
@@ -835,6 +835,10 @@ misc {
     # Default: false
     B:pickUpSkeletonArrows=false
 
+    # Allows creepers to be sheared for gunpowder, after which they cannot explode.
+    # Default: false
+    B:shearableCreepers=false
+
     # In which circumstance a torch should be reoriented when the block it is attached to is broken.
     # Valid values:
     # NEVER

diff --git a/config/recipestages.cfg b/config/recipestages.cfg
@@ -1,6 +1,9 @@
 # Configuration file
 
 general {
+    # Toggle whether to display the item recipe in JEI.
+    B:"Show item recipe"=false
+
     # Toggle whether to display which stage is needed for a recipe to work in the JEI entries.
     B:"Show stage name"=false
 }

diff --git a/config/simple-rpc.json b/config/simple-rpc.json
@@ -1,10 +1,9 @@
 {
-  "discordid": "726535589259902977",
+  "discordid": 726535589259902977,
   "enabled": true,
   "debugging": false,
-  "version": 4,
+  "version": 5,
   "init": {
-    "_comment": "This is called while MC and Forge is loading",
     "enabled": true,
     "state": "Game loading",
     "description": "",
@@ -14,7 +13,6 @@
     "smallImageText": "%mods% mods installed"
   },
   "main_menu": {
-    "_comment": "This is called when the player is on the main menu",
     "enabled": true,
     "state": "Main Menu",
     "description": "",
@@ -24,7 +22,6 @@
     "smallImageText": "%mods% mods installed"
   },
   "server_list": {
-    "_comment": "This is called when the player is on the multiplayer Screen",
     "enabled": true,
     "state": "In Multiplayer Menu",
     "description": "Browsing server list",
@@ -34,7 +31,6 @@
     "smallImageText": "%mods% mods installed"
   },
   "single_player": {
-    "_comment": "This is called when the player is playing in single player mode",
     "enabled": true,
     "state": "Playing singleplayer",
     "description": "In %world%",
@@ -45,7 +41,6 @@
     "allowSpectate": false
   },
   "multi_player": {
-    "_comment": "This is called when the player is playing multi-player",
     "enabled": true,
     "state": "Playing on %servername%",
     "description": "Players: %players%/%maxplayers%",
@@ -57,7 +52,6 @@
     "allowJoin": false
   },
   "join_game": {
-    "_comment": "This is called when the player is joining a game",
     "enabled": true,
     "state": "Joining game",
     "description": "",
@@ -67,12 +61,37 @@
     "smallImageText": "%mods% mods installed"
   },
   "generic": {
-    "_comment": "This is a fallback event for when any of the above ones are disabled",
     "state": "Playing Minecraft",
     "description": "",
     "largeImageKey": "logo_hot",
     "largeImageText": "Minecraft Forge %mcver%",
     "smallImageKey": "",
     "smallImageText": "%mods% mods installed"
+  },
+  "world_images": {
+    "enabled": false,
+    "worlds": [
+      {
+        "worldname": "overworld",
+        "largeImageKey": "overworld",
+        "largeImageText": "In the Overworld",
+        "smallImageKey": "mclogo",
+        "smallImageText": "%mods% mods installed"
+      },
+      {
+        "worldname": "the_nether",
+        "largeImageKey": "nether",
+        "largeImageText": "In the Nether",
+        "smallImageKey": "mclogo",
+        "smallImageText": "%mods% mods installed"
+      },
+      {
+        "worldname": "the_end",
+        "largeImageKey": "end",
+        "largeImageText": "In the End",
+        "smallImageKey": "mclogo",
+        "smallImageText": "%mods% mods installed"
+      }
+    ]
   }
 }