chore: 🧱 automatic files changes

config/MoreDefaultOptions/options.txt

@@ -106,6 +106,7 @@ key_gui.xaero_open_settings:50:CONTROL
 key_gui.xaero_quick_confirm:54
 key_gui.xaero_reverse_entity_radar:0
 key_gui.xaero_switch_waypoint_set:0
+key_gui.xaero_toggle_dimension:0
 key_gui.xaero_toggle_entity_radar:0
 key_gui.xaero_toggle_grid:0
 key_gui.xaero_toggle_light_overlay:0
@@ -358,6 +359,7 @@ key_ping.key.goto:0
 key_ping.key.look:0
 key_ping.key.mine:76
 key_Profile GUI:210
+key_prsm.key.toggle:43
 key_psimisc.keybind:51
 key_quark.emote.cheer:0
 key_quark.emote.clap:0

config/Universal Tweaks - Tweaks.cfg

@@ -1022,6 +1022,7 @@ general {
             harvestcraft:potatosaladitem;uncommon
             harvestcraft:beetsoupitem;uncommon
             harvestcraft:jellyfishrawitem;uncommon
+            harvestcraft:pressedwax;rare
          >
 
         # Sets custom use durations for items like shields, affecting the maximum block time

dev/benchmarks/latest.md

@@ -5,10 +5,10 @@
 
 <p align="center" style="font-size:160%;">
 MC total load time:<br>
-598.88 sec
+463.99 sec
 <br>
 <sup><sub>(
-9:58 min
+7:43 min
 )</sub></sup>
 </p>
 
@@ -20,8 +20,8 @@ MC total load time:<br>
   type: 'horizontalBar',
   data: {
     datasets: [
-      {label:      'MODS:', data: [383.05]},
-      {label: 'FML stuff:', data: [215.83]}
+      {label:      'MODS:', data: [310.34]},
+      {label: 'FML stuff:', data: [153.64]}
     ]
   },
   options: {
@@ -60,30 +60,31 @@ MC total load time:<br>
   },
   data: {...
 `
-436e17  63.63s Had Enough Items;
-9e2174   2.88s Tinkers' Construct;
-8E1E68  27.98s Tinkers' Construct (Oredict Melting);
-516fa8  13.04s Ender IO;
-813e81  12.66s OpenComputers;
-5161a8  11.18s CraftTweaker2;
-5c308f   8.06s Mod Tweaker;
-8f304e   7.26s Astral Sorcery;
-cd922c   7.03s NuclearCraft;
-a651a8   6.21s IndustrialCraft 2;
-8f3087   6.16s Forge Mod Loader;
-6e175e   5.96s Recurrent Complex;
-8c2ccd   5.64s Immersive Engineering;
-213664   5.28s Forestry;
-8f4d30   4.60s Open Terrain Generator;
-3ebab8   4.55s CoFH World;
-a86e51   4.21s Extra Utilities 2;
-436e17   4.03s Integrated Dynamics;
-308f53   3.95s Village Names;
-3e7d81   3.77s ProbeZS;
-308f7e   3.69s Quark: RotN Edition;
-444444 102.00s 52 Other mods;
-333333  62.55s 178 'Fast' mods (load 1.0s - 0.1s);
-222222   6.73s 199 'Instant' mods (load %3C 0.1s)
+436e17  14.55s Had Enough Items;
+3C6315  15.44s Had Enough Items (Plugins);
+3C6315   1.78s Had Enough Items (Ingredient Filter);
+51a857  13.10s Caliper;
+516fa8  10.51s Ender IO;
+5161a8   9.95s CraftTweaker2;
+813e81   8.44s OpenComputers;
+8f304e   7.74s Astral Sorcery;
+5c308f   7.42s Mod Tweaker;
+cd922c   7.22s NuclearCraft;
+a651a8   6.35s IndustrialCraft 2;
+8f3087   6.24s Forge Mod Loader;
+6e175e   5.58s Recurrent Complex;
+8c2ccd   5.37s Immersive Engineering;
+213664   5.04s Forestry;
+a86e51   4.17s Extra Utilities 2;
+436e17   4.09s Integrated Dynamics;
+3e7d81   3.78s ProbeZS;
+308f53   3.76s Village Names;
+308f7e   3.37s Quark: RotN Edition;
+ba3eb8   3.28s Cyclic;
+315a2c   3.16s Mekanism Community Edition;
+444444  89.40s 49 Other mods;
+333333  63.80s 180 'Fast' mods (load 1.0s - 0.1s);
+222222   6.80s 202 'Instant' mods (load %3C 0.1s)
 `
     .split(';').reduce((a, l) => {
       l.match(/(\w{6}) *(\d*\.\d*)s (.*)/)
@@ -152,19 +153,19 @@ a86e51   4.21s Extra Utilities 2;
       .map(l => l.match(/\d: (.*)/).slice(1))
       .forEach(([name]) => a.datasets.push({ label: name, data: [] }));
 `
-                           1      2      3      4      5      6      7      8  ;
-Tinkers' Construct     |  1.07|  0.01|  0.17|  0.07|  0.00| 29.53|  0.00|  0.00;
-Ender IO               |  1.85|  0.01|  4.18|  0.58|  3.67|  1.61|  0.00|  1.14;
-OpenComputers          |  0.41|  0.02|  8.61|  3.41|  0.22|  0.00|  0.00|  0.00;
-CraftTweaker2          |  0.54|  0.00|  4.22|  0.01|  0.00|  6.33|  0.09|  0.00;
-Mod Tweaker            |  0.00|  0.00|  0.01|  0.00|  0.00|  0.00|  8.04|  0.00;
-Astral Sorcery         |  0.22|  0.01|  4.67|  1.77|  0.00|  0.59|  0.00|  0.00;
-NuclearCraft           |  1.22|  0.01|  4.38|  0.45|  0.00|  0.90|  0.00|  0.07;
-IndustrialCraft 2      |  0.71|  0.02|  4.24|  0.94|  0.00|  0.29|  0.00|  0.00;
-Recurrent Complex      |  0.50|  0.00|  0.75|  1.11|  0.00|  3.60|  0.00|  0.00;
-Immersive Engineering  |  0.85|  0.01|  1.23|  1.14|  0.00|  2.41|  0.00|  0.00;
-Forestry               |  0.38|  0.01|  3.28|  1.16|  0.00|  0.44|  0.00|  0.00;
-Open Terrain Generator |  0.05|  0.01|  0.00|  4.55|  0.00|  0.00|  0.00|  0.00
+                          1      2      3      4      5      6      7      8  ;
+Caliper               |  0.05|  0.00|  0.05|  0.00|  0.00|  0.00| 13.00|  0.00;
+Ender IO              |  1.69|  0.01|  3.98|  0.53|  3.24|  0.15|  0.00|  0.92;
+CraftTweaker2         |  0.70|  0.00|  4.21|  0.01|  0.00|  4.96|  0.07|  0.00;
+OpenComputers         |  0.31|  0.02|  4.74|  3.15|  0.22|  0.00|  0.00|  0.00;
+Astral Sorcery        |  0.24|  0.01|  5.28|  1.68|  0.00|  0.54|  0.00|  0.00;
+Mod Tweaker           |  0.00|  0.00|  0.01|  0.00|  0.00|  0.00|  7.41|  0.00;
+NuclearCraft          |  1.31|  0.01|  4.17|  0.44|  0.00|  1.23|  0.00|  0.05;
+IndustrialCraft 2     |  0.74|  0.02|  4.40|  0.93|  0.00|  0.26|  0.00|  0.00;
+Recurrent Complex     |  0.29|  0.00|  0.74|  0.90|  0.00|  3.65|  0.00|  0.00;
+Immersive Engineering |  0.87|  0.01|  1.17|  1.01|  0.00|  2.32|  0.00|  0.00;
+Forestry              |  0.40|  0.01|  3.24|  0.98|  0.00|  0.40|  0.00|  0.00;
+Extra Utilities 2     |  0.14|  0.00|  3.73|  0.07|  0.00|  0.24|  0.00|  0.00
 `
     .split(';').slice(1)
       .map(l => l.split('|').map(s => s.trim()))
@@ -195,7 +196,22 @@ Open Terrain Generator |  0.05|  0.01|  0.00|  4.55|  0.00|  0.00|  0.00|  0.00
         }]
       };
 `
-  0.00: Other -15 Plugins
+  2.33: jeresources.jei.JEIConfig;
+  1.26: com.rwtema.extrautils2.crafting.jei.XUJEIPlugin;
+  0.88: crazypants.enderio.machines.integration.jei.MachinesPlugin;
+  0.86: mezz.jei.plugins.vanilla.VanillaPlugin;
+  0.82: ic2.jeiIntegration.SubModule;
+  0.76: com.buuz135.industrial.jei.JEICustomPlugin;
+  0.70: knightminer.tcomplement.plugin.jei.JEIPlugin;
+  0.58: nc.integration.jei.NCJEI;
+  0.51: com.buuz135.thaumicjei.ThaumcraftJEIPlugin;
+  0.49: crazypants.enderio.base.integration.jei.JeiPlugin;
+  0.45: cofh.thermalexpansion.plugins.jei.JEIPluginTE;
+  0.38: com.github.sokyranthedragon.mia.integrations.jer.JeiJerIntegration$1;
+  0.27: ninjabrain.gendustryjei.GendustryJEIPlugin;
+  0.26: net.bdew.jeibees.BeesJEIPlugin;
+  0.24: lach_01298.qmd.jei.QMDJEI;
+  4.68: Other 125 Plugins
 `
         .split(';')
         .map(l => l.split(':'))
@@ -232,7 +248,7 @@ Open Terrain Generator |  0.05|  0.01|  0.00|  4.55|  0.00|  0.00|  0.00|  0.00
             font: {size: 18}
           },
           {
-            text: [215.83,'s'].join(''),
+            text: [153.64,'s'].join(''),
             color: 'rgba(128, 128, 128, 1)',
             font: {size: 22}
           }
@@ -252,16 +268,15 @@ Open Terrain Generator |  0.05|  0.01|  0.00|  4.55|  0.00|  0.00|  0.00|  0.00
       }]
     };
 `
-993A00   1.23s Loading sounds;
-994400   1.29s Loading Resource - SoundHandler;
-994F00  42.11s ModelLoader: blocks;
-995900  14.37s ModelLoader: items;
-996300  15.91s ModelLoader: baking;
-996D00   2.48s Applying remove recipe actions;
-997700   0.41s Applying remove furnace recipe actions;
-998200   0.76s Indexing ingredients;
-998C00  16.09s Indexing ingredients;
-444444 121.18s Other
+993A00   0.59s Loading sounds;
+994400   0.66s Loading Resource - SoundHandler;
+994F00  37.19s ModelLoader: blocks;
+995900  12.35s ModelLoader: items;
+996300  16.38s ModelLoader: baking;
+996D00   2.32s Applying remove recipe actions;
+997700   0.24s Applying remove furnace recipe actions;
+998200   0.82s Indexing ingredients;
+444444  83.10s Other
 `
     .split(';')
       .map(l => l.match(/(\w{6}) *(\d*\.\d*)s (.*)/))

resources/autotooltips/lang/en_us.lang

@@ -20,6 +20,20 @@ tooltips.lang.ic2:quantum_chestplate=§bSpace+V§r to hover\n§bShift+V§r to di
 tooltips.lang.ic2:te:48=Disabled. Use the Advanced Scrap Factory
 tooltips.lang.minecraft:torch=§4Light level was nerfed
 tooltips.lang.openblocks:tank=Stores up to §f24§r buckets
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:blaze'}=§eSet player on fire
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:cave_spider'}=§ePoisoning player
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:cow'}=§eGiving Leather. §4Can't be crafted with Anvil.
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:creeper'}=§eMake explosion
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:elder_guardian'}=§eShows animation
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:enderman'}=§eShoot Enderpearl
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:evocation_illager'}=§eShows totem
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:llama'}=§eSpit on player
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:mooshroom'}=§eSpawn shrooms around
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:shulker'}=§eLevitate player
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:skeleton'}=§eShoot Arrow
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:snowman'}=§eSpawn snow
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:squid'}=§eSpawn water
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:witch'}=§eBlind player
 tooltips.lang.opencomputers:print=§51)§r Setup Tier2+ computer with Internet card\n§52)§r Craft & insert OPPM floppy\n§53)§r Run §n"install oppm"§r\n§54)§r Run §n"oppm install print3d"§r and §n"oppm install print3d-examples"§r\n§55)§r §n"print3d ../usr/share/models/cc.3dm"§r
 tooltips.lang.quark:archaeologist_hat=Increases Gems drop when mining by 100%
 tooltips.lang.quark:chain=Can be used to connect boats and minecarts together.

resources/autotooltips/lang/ru_ru.lang

@@ -20,6 +20,20 @@ tooltips.lang.ic2:quantum_chestplate=§bПробел+V§r чтобы завис
 tooltips.lang.ic2:te:48=Отключено. Используйте Advanced Scrap Factory
 tooltips.lang.minecraft:torch=§4 Уровень освещенности уменьшен
 tooltips.lang.openblocks:tank=Хранит до §f24§r ведер
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:blaze'}=§eПоджечь игрока
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:cave_spider'}=§eОтравление игрока
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:cow'}=§eДает кожу. §4Нельзя сделать Наковальней.
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:creeper'}=§eСделать взрыв
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:elder_guardian'}=§eПоказывает анимацию
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:enderman'}=§eСтрелять Enderpearl
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:evocation_illager'}=§eПоказывает тотем
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:llama'}=§eПлюнуть на игрока
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:mooshroom'}=§eСоздайте грибы вокруг
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:shulker'}=§eЛевитировать игрок
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:skeleton'}=§eСтрелять стрелой
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:snowman'}=§eСпаун снег
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:squid'}=§eВода для возрождения
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:witch'}=§eСлепой игрок
 tooltips.lang.opencomputers:print=\n §5 1) §r Создайте дискету OPPM '\n §5 2) §r Установите ее на компьютер Tier2 + с интернет-картой' \n  §5 3) §r Запустите §n "oppm install oppm" §r '\n §5 4) §r Restart' \n §5 5) §r Запустите §n "oppm install print3d" §r и §n "oppm install print3d-examples" §r '\n §5 6) §r §n "print3d ../usr/share/models/cc.3dm" §r
 tooltips.lang.quark:archaeologist_hat=Увеличивает выпадение драгоценных камней при добыче на 100%
 tooltips.lang.quark:chain=Может использоваться для соединения лодок и вагонеток.

resources/autotooltips/lang/zh_cn.lang

@@ -20,6 +20,20 @@ tooltips.lang.ic2:quantum_chestplate=§b空格+V§r 悬停\n§bShift+V§r 关闭
 tooltips.lang.ic2:te:48=已被禁用。请改用高级废料工厂(Advanced Scrap Factory)
 tooltips.lang.minecraft:torch=§4光照等级已被削弱§r，不妨改用其他光源
 tooltips.lang.openblocks:tank=可存储 §f24§r 桶流体
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:blaze'}=§e点燃玩家
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:cave_spider'}=§e使玩家中毒
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:creeper'}=§e发出爆炸
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:cow'}=§e赠送皮革. §4无法用铁砧制作。
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:elder_guardian'}=§e展示其动画
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:enderman'}=§e发射末影珍珠
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:evocation_illager'}=§e展示其图腾
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:llama'}=§e对你吐痰，对，就你，乱摸战利品那个
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:mooshroom'}=§e在附近生成蘑菇
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:shulker'}=§e使玩家漂浮
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:skeleton'}=§e发射箭矢
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:snowman'}=§e产生雪
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:squid'}=§e产生水
+tooltips.lang.openblocks:trophy:{entity_id:'minecraft:witch'}=§e使玩家失明
 tooltips.lang.opencomputers:print=§51)§r 准备一个带有网卡的二级或更高级的电脑\n§52)§r 放入一个OPPM （包管理器）软盘\n§53)§r 运行 §n"install oppm"§r\n§54)§r 运行 §n"oppm install print3d"§r 以及 §n"oppm install print3d-examples"§r\n§55)§r 以及 §n"print3d ../usr/share/models/cc.3dm"§r
 tooltips.lang.quark:archaeologist_hat=提升采矿时的宝石掉落，平均增加 100%
 tooltips.lang.quark:chain=可用于连接船或是矿车。

resources/contenttweaker/lang/en_us.lang

@@ -463,19 +463,6 @@ tooltips.lang.tcon.fusewood=§nFusewood§r crafts from §nShimmerwood§r
 tooltips.lang.tcon.darkwood=§nDarkwood§r crafts from §nLightwood§r
 tooltips.lang.tcon.bloodwood=§nBloodwood§r crafts from §nBlood Wood§r
 tooltips.lang.tcon.ghostwood=§nGhostwood§r crafts from §nDreadwood§r
-tooltips.lang.trophy.blaze=§eSet player on fire
-tooltips.lang.trophy.cave_spider=§ePoisoning player
-tooltips.lang.trophy.creeper=§eMake explosion
-tooltips.lang.trophy.enderman=§eShoot Enderpearl
-tooltips.lang.trophy.evocation_illager=§eShows totem
-tooltips.lang.trophy.elder_guardian=§eShows animation
-tooltips.lang.trophy.llama=§eSpit on player
-tooltips.lang.trophy.mooshroom=§eSpawn shrooms around
-tooltips.lang.trophy.shulker=§eLevitate player
-tooltips.lang.trophy.skeleton=§eShoot Arrow
-tooltips.lang.trophy.snowman=§eSpawn snow
-tooltips.lang.trophy.squid=§eSpawn water
-tooltips.lang.trophy.witch=§eBlind player
 tooltips.lang.kill.slime.by.zombie=§2Drops when §nSlime§2 killed by §nZombie
 tooltips.lang.kill.slime.by.enderman=§2Drops when §nSlime§2 killed by §nEnderman§2.§r\nUse §nChaos Reaper§r.
 tooltips.lang.kill.slime.by.marbled_cheese_golem=§2Drops when §nSlime§2 killed by §nRatlanean Automaton

resources/contenttweaker/lang/ru_ru.lang

@@ -463,19 +463,6 @@ tooltips.lang.tcon.fusewood=§nFusewood§r делается из §nМерцед
 tooltips.lang.tcon.darkwood=§nDarkwood§r делается из §nСветодерева§r
 tooltips.lang.tcon.bloodwood=§nBloodwood§r делается из §nКроводерева§r
 tooltips.lang.tcon.ghostwood=§nGhostwood§r делается из §nУжасдерева§r
-tooltips.lang.trophy.blaze=§eПоджечь игрока
-tooltips.lang.trophy.cave_spider=§eОтравление игрока
-tooltips.lang.trophy.creeper=§eСделать взрыв
-tooltips.lang.trophy.enderman=§eСтрелять Enderpearl
-tooltips.lang.trophy.evocation_illager=§eПоказывает тотем
-tooltips.lang.trophy.elder_guardian=§eПоказывает анимацию
-tooltips.lang.trophy.llama=§eПлюнуть на игрока
-tooltips.lang.trophy.mooshroom=§eСоздайте грибы вокруг
-tooltips.lang.trophy.shulker=§eЛевитировать игрок
-tooltips.lang.trophy.skeleton=§eСтрелять стрелой
-tooltips.lang.trophy.snowman=§eСпаун снег
-tooltips.lang.trophy.squid=§eВода для возрождения
-tooltips.lang.trophy.witch=§eСлепой игрок
 tooltips.lang.kill.slime.by.zombie=§aПадает когда Зомби убивает Слайма
 tooltips.lang.kill.slime.by.enderman=§aПадает когда §nЭндермен§r убивает §nСлайма§r
 tooltips.lang.kill.slime.by.marbled_cheese_golem=§2Падает когда §nРатландский Автоматон§2 убивает §nСлайма

resources/contenttweaker/lang/zh_cn.lang

@@ -463,19 +463,6 @@ tooltips.lang.tcon.fusewood=§n熔融木§r可以通过§n微光木§r合成获
 tooltips.lang.tcon.darkwood=§n暗黑木§r可以通过§n轻木§r合成获得
 tooltips.lang.tcon.bloodwood=§n血木§r可以通过§n血木（原木）§r合成获得
 tooltips.lang.tcon.ghostwood=§n幽魂木§r可以通过§n悚木§r合成获得
-tooltips.lang.trophy.blaze=§e点燃玩家
-tooltips.lang.trophy.cave_spider=§e使玩家中毒
-tooltips.lang.trophy.creeper=§e发出爆炸
-tooltips.lang.trophy.enderman=§e发射末影珍珠
-tooltips.lang.trophy.evocation_illager=§e展示其图腾
-tooltips.lang.trophy.elder_guardian=§e展示其动画
-tooltips.lang.trophy.llama=§e对你吐痰，对，就你，乱摸战利品那个
-tooltips.lang.trophy.mooshroom=§e在附近生成蘑菇
-tooltips.lang.trophy.shulker=§e使玩家漂浮
-tooltips.lang.trophy.skeleton=§e发射箭矢
-tooltips.lang.trophy.snowman=§e产生雪
-tooltips.lang.trophy.squid=§e产生水
-tooltips.lang.trophy.witch=§e使玩家失明
 tooltips.lang.kill.slime.by.zombie=§2在§n史莱姆§2被§n僵尸§r击杀时掉落
 tooltips.lang.kill.slime.by.enderman=§2在§n史莱姆§2被§n末影人§2击杀时掉落。§r\n不妨试试§n生物催眠杖§r。
 tooltips.lang.kill.slime.by.marbled_cheese_golem=§2在§n史莱姆§2被§nRatlanean Automaton§r击杀时掉落