From e19a71a5faa1b3d37cb597632390fe49d61f6803 Mon Sep 17 00:00:00 2001 From: Ko_no <90126004+MrKono@users.noreply.github.com> Date: Tue, 5 Sep 2023 20:16:30 +0900 Subject: [PATCH 01/15] [fix] Power Substation's tooltip --- overrides/resources/gregtech/lang/ja_jp.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overrides/resources/gregtech/lang/ja_jp.lang b/overrides/resources/gregtech/lang/ja_jp.lang index b3ab0a24..41aaadc7 100644 --- a/overrides/resources/gregtech/lang/ja_jp.lang +++ b/overrides/resources/gregtech/lang/ja_jp.lang @@ -4684,7 +4684,7 @@ gregtech.multiblock.data_bank.description=データバンクは複数のアセ gregtech.machine.power_substation.name=大型蓄電器 gregtech.machine.power_substation.tooltip1=中央集権型送電網の心臓部 gregtech.machine.power_substation.tooltip2=§f蓄電ブロック§7のTierを揃える必要はない。 -gregtech.machine.power_substation.tooltip3=§f蓄電ブロック§7は§%d層§7まで増築できる。 +gregtech.machine.power_substation.tooltip3=§f蓄電ブロック§7は§f%d層§7まで増築できる。 gregtech.machine.power_substation.tooltip4=§f24時間毎に§7最大蓄電量の§f1%%§7を損失する。 gregtech.machine.power_substation.tooltip5=蓄電ブロック当たり§f%,d EU/t§7の受動損失。 gregtech.multiblock.power_substation.description=大型蓄電器は大量の電力を蓄えることができるマルチブロックです。蓄電ブロックの層は18層まで拡張できます。蓄電ブロック層は埋め尽くさないといけないので、空いた空間は空の蓄電ブロックを設置しましょう。 From 5fa63fbdc2af96f935caba99c7c244d58b4ada2e Mon Sep 17 00:00:00 2001 From: tier940 Date: Sun, 10 Sep 2023 15:52:24 +0900 Subject: [PATCH 02/15] Move mod - TOP -> TOPCE --- manifest.json | 4 +-- modlist.html | 2 +- overrides/config/theoneprobe.cfg | 42 +++++++++++++++++++++++++++----- 3 files changed, 39 insertions(+), 9 deletions(-) diff --git a/manifest.json b/manifest.json index 07ba22de..6e413846 100644 --- a/manifest.json +++ b/manifest.json @@ -135,8 +135,8 @@ "required": true }, { - "projectID": 245211, - "fileID": 2667280, + "projectID": 885670, + "fileID": 4745095, "required": true }, { diff --git a/modlist.html b/modlist.html index 3a0fc063..e3b54f76 100644 --- a/modlist.html +++ b/modlist.html @@ -23,7 +23,7 @@
  • FPS Reducer (by bre2el)
  • p455w0rd's Library (by TheRealp455w0rd)
  • BisectHosting Server Integration Menu [FORGE] (by BisectHosting)
    • -
  • The One Probe (by McJty)
    • +
  • The One Probe Community Edition (by xuanyu)
  • RealBench (by Prototik)
  • FTB Ultimine (Forge) (by FTB)
  • Zen Utils (by youyihj)
    • diff --git a/overrides/config/theoneprobe.cfg b/overrides/config/theoneprobe.cfg index 7b095eae..1644c884 100644 --- a/overrides/config/theoneprobe.cfg +++ b/overrides/config/theoneprobe.cfg @@ -1,5 +1,23 @@ # Configuration file +########################################################################################################## +# botania +#--------------------------------------------------------------------------------------------------------# +# botania settings +########################################################################################################## + +botania { + # Whether to enable Botania's top display [default: true] + B:Botaniatop=true + + # Whether to show Botania's mana [default: true] + B:showBotaniaprogress=true + + # Whether the mana value should be displayed in or below the mana bar [default: true] + B:testinprogress=true +} + + ########################################################################################################## # client #--------------------------------------------------------------------------------------------------------# @@ -52,6 +70,15 @@ client { # 0 means don't show break progress, 1 is show as bar, 2 is show as text [range: 0 ~ 2, default: 1] I:showBreakProgress=1 + # true means shows Custom harvestLevel (you can chance name in the lang) [default: false] + B:showCustomharvestLevelName=false + + # true means shows entity info [default: true] + B:showEntityInfo=true + + # true means shows entity model [default: true] + B:showEntityModel=true + # If true show liquid information when the probe hits liquid first [default: false] B:showLiquids=false @@ -105,7 +132,7 @@ providers { S:excludedProviders < > - # Order in which entity providers should be used [default: [theoneprobe:entity.default], [theoneprobe:entity.debug], [theoneprobe:entity.entity], [topaddons:base], [topaddons:architecturecraft], [topaddons:chisel], [topaddons:forestry], [topaddons:opencomputers], [topaddons:storagedrawers], [topaddons:vanilla]] + # Order in which entity providers should be used [default: [theoneprobe:entity.default], [theoneprobe:entity.debug], [theoneprobe:entity.entity], [topaddons:base], [topaddons:architecturecraft], [topaddons:chisel], [topaddons:opencomputers], [topaddons:storagedrawers], [topaddons:vanilla]] S:sortedEntityProviders < theoneprobe:entity.default theoneprobe:entity.debug @@ -113,22 +140,20 @@ providers { topaddons:base topaddons:architecturecraft topaddons:chisel - topaddons:forestry topaddons:opencomputers topaddons:storagedrawers topaddons:vanilla > - # Order in which providers should be used [default: [theoneprobe:default], [theoneprobe:debug], [theoneprobe:block], [gregtech:energy_container_provider], [gregtech:fuelable_provider], [gregtech:workable_provider], [gregtech:controllable_provider], [gregtech:debug_pipe_net_provider], [gregtech:transformer_info_provider], [gregtech:diode_info_provider], [gregtech:multiblock_controller_provider], [gregtech:multiblock_maintenance_provider], [gregtech:multi_recipemap_provider], [gregtech:converter_info_provider], [gregtech:recipe_logic_provider], [gregtech:primitive_pump_provider], [gregtech:coverable_provider], [gregtech:ore_block_provider], [gregtech:lamp_info_provider], [gregtechfoodoption:root_crop_provider], [appliedenergistics2:TileInfoProvider], [appliedenergistics2:PartInfoProvider], [enderio:default], [topaddons:base], [topaddons:architecturecraft], [topaddons:chisel], [topaddons:forestry], [topaddons:opencomputers], [topaddons:storagedrawers], [topaddons:vanilla]] + # Order in which providers should be used [default: [theoneprobe:default], [theoneprobe:debug], [theoneprobe:block], [topce.crt], [gregtech:energy_container_provider], [gregtech:workable_provider], [gregtech:controllable_provider], [gregtech:transformer_info_provider], [gregtech:diode_info_provider], [gregtech:multiblock_controller_provider], [gregtech:multiblock_maintenance_provider], [gregtech:multi_recipemap_provider], [gregtech:converter_info_provider], [gregtech:recipe_logic_provider], [gregtech:primitive_pump_provider], [gregtech:coverable_provider], [gregtech:ore_block_provider], [gregtech:lamp_info_provider], [gregtech:ld_pipe_provider], [gregtech:debug_pipe_net_provider], [gregtech:debug_tick_time_provider], [gregtechfoodoption:root_crop_provider], [gtexpert:electric_spawner], [appliedenergistics2:TileInfoProvider], [appliedenergistics2:PartInfoProvider], [enderio:default], [compactmachines3:default], [topaddons:base], [topaddons:architecturecraft], [topaddons:chisel], [topaddons:opencomputers], [topaddons:storagedrawers], [topaddons:vanilla], [fluxnetworks]] S:sortedProviders < theoneprobe:default theoneprobe:debug theoneprobe:block + topce.crt gregtech:energy_container_provider - gregtech:fuelable_provider gregtech:workable_provider gregtech:controllable_provider - gregtech:debug_pipe_net_provider gregtech:transformer_info_provider gregtech:diode_info_provider gregtech:multiblock_controller_provider @@ -140,17 +165,22 @@ providers { gregtech:coverable_provider gregtech:ore_block_provider gregtech:lamp_info_provider + gregtech:ld_pipe_provider + gregtech:debug_pipe_net_provider + gregtech:debug_tick_time_provider gregtechfoodoption:root_crop_provider + gtexpert:electric_spawner appliedenergistics2:TileInfoProvider appliedenergistics2:PartInfoProvider enderio:default + compactmachines3:default topaddons:base topaddons:architecturecraft topaddons:chisel - topaddons:forestry topaddons:opencomputers topaddons:storagedrawers topaddons:vanilla + fluxnetworks > } From 48674481a86d1c5aa2ce50edd4721bcbc62889ab Mon Sep 17 00:00:00 2001 From: tier940 Date: Thu, 14 Sep 2023 16:09:01 +0900 Subject: [PATCH 03/15] # Update mods - CraftPresence - ModularUI - Inventory Bogo Sorter - CraftTweaker - Zen Utils - GTExpert2 Core Mod - BisectHosting Server Integration Menu - LoliASM # Add mod - Red Core # Remove mods - It's the little things - Spark Unforged - Phosphor Crash Fix # Move mods - VintageFix -> Valkyrie - Phosphor -> Alfheim Lighting Engine --- CHANGELOG_v2.md | 25 ++++++++++ manifest.json | 36 ++++++--------- modlist.html | 9 ++-- overrides/config/Valkyrie.cfg | 4 +- overrides/config/craftpresence.json | 1 + overrides/config/gtexpert.cfg | 9 +++- overrides/config/itlt.cfg | 43 ------------------ overrides/config/phosphor.json | 4 -- overrides/config/vintagefix.properties | 19 -------- .../icons/icon_128.png} | Bin overrides/resourcepacks/icons/icon_16.png | Bin 0 -> 4563 bytes overrides/resourcepacks/icons/icon_256.png | Bin 0 -> 7612 bytes overrides/resourcepacks/icons/icon_32.png | Bin 0 -> 5083 bytes overrides/resourcepacks/icons/icon_48.png | Bin 0 -> 5152 bytes .../scripts/normal/AppliedEnergistics.zs | 6 +-- 15 files changed, 55 insertions(+), 101 deletions(-) delete mode 100644 overrides/config/itlt.cfg delete mode 100644 overrides/config/phosphor.json delete mode 100644 overrides/config/vintagefix.properties rename overrides/{config/itlt/icon.png => resourcepacks/icons/icon_128.png} (100%) create mode 100644 overrides/resourcepacks/icons/icon_16.png create mode 100644 overrides/resourcepacks/icons/icon_256.png create mode 100644 overrides/resourcepacks/icons/icon_32.png create mode 100644 overrides/resourcepacks/icons/icon_48.png diff --git a/CHANGELOG_v2.md b/CHANGELOG_v2.md index 88db08c6..f1a73de5 100644 --- a/CHANGELOG_v2.md +++ b/CHANGELOG_v2.md @@ -1,3 +1,28 @@ +# v2.5.5 +## Update mods +- CraftPresence +- ModularUI +- Inventory Bogo Sorter +- CraftTweaker +- Zen Utils +- GTExpert2 Core Mod +- BisectHosting Server Integration Menu +- LoliASM + +## Add mod +- Red Core + +## Remove mods +- It's the little things +- Spark Unforged +- Phosphor Crash Fix + +## Move mods +- VintageFix -> Valkyrie +- Phosphor -> Alfheim Lighting Engine + +* * * + # v2.5.4 # Update mods - AE2 Unofficial Extended Life diff --git a/manifest.json b/manifest.json index 6e413846..75fef8e1 100644 --- a/manifest.json +++ b/manifest.json @@ -26,12 +26,12 @@ }, { "projectID": 624243, - "fileID": 4635658, + "fileID": 4692436, "required": true }, { "projectID": 632327, - "fileID": 4692161, + "fileID": 4750417, "required": true }, { @@ -131,7 +131,7 @@ }, { "projectID": 585546, - "fileID": 4628846, + "fileID": 4743092, "required": true }, { @@ -151,7 +151,7 @@ }, { "projectID": 401178, - "fileID": 4674014, + "fileID": 4746454, "required": true }, { @@ -171,7 +171,7 @@ }, { "projectID": 297038, - "fileID": 4682465, + "fileID": 4720396, "required": true }, { @@ -236,7 +236,7 @@ }, { "projectID": 239197, - "fileID": 4707234, + "fileID": 4731280, "required": true }, { @@ -394,11 +394,6 @@ "fileID": 4699275, "required": true }, - { - "projectID": 232791, - "fileID": 3330021, - "required": true - }, { "projectID": 258881, "fileID": 2512758, @@ -504,11 +499,6 @@ "fileID": 4571247, "required": true }, - { - "projectID": 871198, - "fileID": 4714078, - "required": true - }, { "projectID": 876339, "fileID": 4592511, @@ -520,8 +510,8 @@ "required": true }, { - "projectID": 900927, - "fileID": 4708794, + "projectID": 460609, + "fileID": 4623985, "required": true }, { @@ -596,7 +586,7 @@ }, { "projectID": 851103, - "fileID": 4742717, + "fileID": 4746844, "required": true }, { @@ -640,13 +630,13 @@ "required": true }, { - "projectID": 318255, - "fileID": 2919497, + "projectID": 873867, + "fileID": 4742905, "required": true }, { - "projectID": 739808, - "fileID": 4183001, + "projectID": 910715, + "fileID": 4749295, "required": true } ], diff --git a/modlist.html b/modlist.html index e3b54f76..337a0506 100644 --- a/modlist.html +++ b/modlist.html @@ -75,7 +75,6 @@
  • Lazy AE2 (by phantamanta44)
  • Dynamistics (by Eutropium)
  • MixinBooter (by Rongmario)
    • -
  • It's the little things (by Zlepper)
  • Faster Ladder Climbing (by maddachshund)
  • Bansōkō [絆創膏] - Mod Patcher (by Rongmario)
  • FTB Library (Forge) (Legacy) (by FTB)
    • @@ -97,10 +96,9 @@
  • NetherPortalFix (by BlayTheNinth)
  • Item Filters (by LatvianModder)
  • Had Enough Items (by cleanroommc)
    • -
  • VintageFix (by embeddedt)
  • EnhancedP2P (by blacy1551)
  • dan's Mouse Tweaks (by cleanroommc)
    • -
  • Spark Unforged (by fonnymunkey)
    • +
  • CensoredASM (by Rongmario)
  • AE2 Fluid Crafting Rework (by jojo2k333)
  • Xtones (by TehNut)
  • Universal Tweaks (by ACGaming56)
    • @@ -123,6 +121,7 @@
  • UntranslatedItems: AlsoFluids (by katatsumuri_pan)
  • EZStorage 2 Patch (by sjcl)
  • p455w0rd's AE2 Wireless Terminals Patch (by katatsumuri_pan)
    • -
  • Phosphor (Forge) (by jellysquid3_)
    • -
  • Phosphor Crash Fix (by Elephant_1214)
    • +
  • Red Core (by Desoroxxx)
    • +
  • Valkyrie (by Desoroxxx)
    • +
  • Alfheim Lighting Engine (by Desoroxxx)
    • diff --git a/overrides/config/Valkyrie.cfg b/overrides/config/Valkyrie.cfg index c043d011..8f4cc285 100644 --- a/overrides/config/Valkyrie.cfg +++ b/overrides/config/Valkyrie.cfg @@ -3,8 +3,8 @@ general { general { - B:customIcons=false - B:highPrecisionDepthBuffer=false + B:customIcons=true + B:highPrecisionDepthBuffer=true S:windowTitle=GregTech Expert 2 } diff --git a/overrides/config/craftpresence.json b/overrides/config/craftpresence.json index 6a367bf1..cf953a21 100644 --- a/overrides/config/craftpresence.json +++ b/overrides/config/craftpresence.json @@ -9,6 +9,7 @@ "detectMultiMCManifest": false, "detectMCUpdaterInstance": false, "detectTechnicPack": false, + "detectModrinthPack": false, "detectBiomeData": true, "detectDimensionData": true, "detectWorldData": true, diff --git a/overrides/config/gtexpert.cfg b/overrides/config/gtexpert.cfg index 62621058..4369b7bb 100644 --- a/overrides/config/gtexpert.cfg +++ b/overrides/config/gtexpert.cfg @@ -8,10 +8,15 @@ general { # Default: false B:hardSolarPanel=true - # Making Planks and Sticks even more difficult. + # Making Planks even more difficult. # CEu's nerfWoodCrafting to true to reflect. # Default: false - B:moreNerfWoodCrafting=true + B:moreNerfPlankCrafting=true + + # Making Sticks even more difficult. + # CEu's harderRods to true to reflect. + # Default: false + B:moreNerfStickCrafting=true # Raising Terracotta Grinding from ULV to MV. # Default: false diff --git a/overrides/config/itlt.cfg b/overrides/config/itlt.cfg deleted file mode 100644 index b7bf436a..00000000 --- a/overrides/config/itlt.cfg +++ /dev/null @@ -1,43 +0,0 @@ -# Configuration file - -bitdetection { - # If ShouldYellAt32BitUsers is set to true, this is the message that will be displayed to the user. - S:ErrorMessage=You are using a 32 bit version of java. This is not recommended with this modpack. - - # Set to true to make itlt yell at people attempting to use 32x java for the modpack. - B:ShouldYellAt32BitUsers=true -} - - -display { - # Set to true to make minecraft attempt to maximize itself on startup (This is kinda unstable right now, so don't trust it too much) - B:ShouldMaximizeDisplay=false - - # Set to true to load a custom icon from config\itlt\icon.png - B:loadCustomIcon=true - - # Set to true to attempt to get the display name of the pack of the info json file - # This will take priority over windowDisplayTitle - B:useTechnicDisplayName=false - - # Set to true to attempt to use the icon assigned to the modpack by the technic launcher. - # This will take priority over loadCustomIcon - B:useTechnicIcon=false - - # Change this value to change the name of the MineCraft window - S:windowDisplayTitle=GregTech Expert 2 -} - - -server { - # Set to true to have a dedicated server added to the server list ingame. The server will not overwrite others servers. - B:AddDedicatedServer=false - - # The ip of the dedicated server to add. - S:ServerIP=127.0.0.1:25555 - - # The name of the dedicated server to add. - S:ServerName=Localhost -} - - diff --git a/overrides/config/phosphor.json b/overrides/config/phosphor.json deleted file mode 100644 index e67c6859..00000000 --- a/overrides/config/phosphor.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "enable_illegal_thread_access_warnings": true, - "enable_phosphor": true -} diff --git a/overrides/config/vintagefix.properties b/overrides/config/vintagefix.properties deleted file mode 100644 index 0fd03db9..00000000 --- a/overrides/config/vintagefix.properties +++ /dev/null @@ -1,19 +0,0 @@ -# VintageFix config file - -mixin.backports.new_world_name=true -mixin.backports.white_button_text=true -mixin.blockstates=true -mixin.branding=true -mixin.bugfix.missing_edge_chunks=true -mixin.bugfix.tab_complete_ddos=true -mixin.dynamic_resources=true -mixin.dynamic_resources.background_item_bake=true -mixin.dynamic_resources.hide_model_exceptions=false -mixin.dynamic_structures=true -mixin.mod_opts.agricraft=true -mixin.model_optimizations.dedup_baked_quad=true -mixin.model_optimizations.dedup_multipart=true -mixin.model_optimizations.dedup_quad_lists=true -mixin.model_optimizations.location_canon=true -mixin.resourcepacks=true -mixin.textures=true diff --git a/overrides/config/itlt/icon.png b/overrides/resourcepacks/icons/icon_128.png similarity index 100% rename from overrides/config/itlt/icon.png rename to overrides/resourcepacks/icons/icon_128.png diff --git a/overrides/resourcepacks/icons/icon_16.png b/overrides/resourcepacks/icons/icon_16.png new file mode 100644 index 0000000000000000000000000000000000000000..46cd4151b72a4b94daaa94bbe6746d988b799aaa GIT binary patch literal 4563 zcmeHLd2kcw6<>$OHn#C-k^)Ww^?ES_23C7XvUZX1CE1n}VZ{jW5o)jYkT;gJLRwq0 z9VY=(Xaa4VrkM$bG#n;`GPq4}(ohEoF=ru=lupxzfe;T2wTTTaE>29syQr{Q@k6B@u$cpL-o;i5+mlz_lMQ&VDE+_Qdw8c|FmK?`GTf)-=!EbgOBq z?ZUP13SNq0?ag~%T@gpONw4&NRJr5EnU=+QnH%1}dcH(cctk$)NkLz7?VDR34z2vg z#h;tMs6YGs%|9gX499ZF>bKWF89(RbB7aifH|TUOHdfS-Ki6B;_6l^yzY>m%L2*z{Ft#aZY?>Y=9R>Y1iP7dDq9)gFE;9fG3PNjW(V zTTae!J|K&&4KJJXJ2Gb-D=&L@!M?;AO;^))=I>VPtjDKstk~W*y|fxX&==pVOHI@M za&6U-BQG8MZR5uMt%OZ&*3lH#_P-n}nz{d-R?Rt0 z9&g?CjC_{ed~1e#SE;+F{$Derzr#o4sU~j>TYjiy)R^8#= z%dl!+cxpNxShOwr!5uv@_Zq*r_~@~&w0UWon7Z;s*ST3YZ#=MXz0iVGr&>3s`sc+vj;eq&sR{G$( z{j0x)_&s~CK6d%C=C%1x-u~n1_JQ{Lf&M4j4<|oe7}#0lSl0U&Zz(7*6(T zSzdMt+OXFT8V`a@8DT%mRS63065Nu{jNE8HjKC6aMpo+WxZR&4R7&}E0byC)QYTke z#nC*Hu_VqEW&nU!P*^zZ_4tBJ*o;JQ8E~(PF$9j7C{<>p*zSOHBoKo1Yc=k?p|Bk;c95DS10EX?{bLW^TwFE-XAs90+N z$WTB(=n-^+V~Q0CLAg4>3Dz3Hr_31(!E+=2{_21yk`B*df=BQI(;(QD7`J7f&F&cS zP$_UrUVp?3kUh>)k;GB5#>J*;BI%3`1h|jjj~_W?bJc2iHj5ci_h)#S zlXxa_E0B7cBX}GoDN#Um0>z`O-XNj^tD{JsFt|jH9s_0b1r^rE2`Ur-*Gd3KG`dI@ z7dh0(u`X0+)Voj`H*hEbCJBR)r$l-zL}5SzUCDaJMx{dW0Lmbe1WocBN*P5K)ftR9 zN^=~z6J4TN%peg9F903Tt5%0f6Ep#o#nU=$wR}A&m@0ECfq@ zjJ?cDV(ovkR*w&C8Z3Ig6a@R%Mnr>WYMHQla5cE}NRh(?!;xdbu-sq@LAFNVBXI(( zK^0fY`rHDTA43g0ESG+u83@|IvFVh6iXKmlCB9cFd^f~?)tyc6*u~< zDEPn+ybyR2yu7?k{Wl}p^?05Ix~IOk9o+p2kWBUGmjodw{$ceK1vPI?0>T)@X1B&% zo0=FsD`nlOT@nzzVY6g8ji>khDl4uL*I3Kjb~mjn@?Y5BcV*RqX+5qFa__9FEPJ~W zx!sYu9?zh#DKS_7s@1;U)$r_38yAwV&GbsX;@Pvm{B?cG?vB~c=LUXO^!yghhP0Yf zJ7&U}Gaf7PEUDeI0ov0#_juCBAH0}S+Sl~q%l_1_RxkWw%Eo8uhY~{B7k;<)yERFl w-z_tp?k6fvZTs{9b@k9^_797@QrrKGy#p;j-!}03dJrmPvo5u?W>>8J4@h%m+yDRo literal 0 HcmV?d00001 diff --git a/overrides/resourcepacks/icons/icon_256.png b/overrides/resourcepacks/icons/icon_256.png new file mode 100644 index 0000000000000000000000000000000000000000..3d04df52b4c67df40d608a1d6affd7648b8baf9e GIT binary patch literal 7612 zcmeHLc|4Ts+kZwy$yTY*Vw#B3m4unyZireg_|ZCJ&%mmJkb^%-}pAYU=?Lu zqj2-gy41rTXIHlDR(NimyyoL*@xj2UORm0t_hqz2kd+dznt;!Hc43UdC7lE$U*Cs@ z`%mh-K<9hdFn>r(hNUF!+NBXNxf3)kEkmM~*4KQ%ED{2u3H!@-ZG38LmAk`CKrLOB zlAbtp4Hl7lTIY^ovtSlJ-um-0J*gP+_4^*@c63zO)jfV{X(3>-TWkh!_i#66N3Wib z6F>aK+pRUyYihIC2*9}hr}%XRLHW##w0Ed2m#x;$WcQUpeUYc{R0_ePZC;dm_`fYH zYbab^!_=JWm53VSU!ueR%=0I`PtM_wM16`Lj45LzoKf-f zu{W$q={XhhWY67@R1tgGBU_TTh&(%efZKMf4BZQ_K9E{|c&ZB_)Kzyuseu-;H9}S< z>IASt`MlAwQ_Hh?dAYw)X^>s+^AfC){RU}auc2q@gS2s|20HChv?M5OyQ`t~EssoKqfQ=NEz@Rh= z0cN4BhtzY^qB_#{`!cB}zWSzQUuQCo0@KtGRQJY%0IpOv3F__YLTBN<39toRJb2GD zBVf=47q&A2c1X_NVZp-PHMib%MQH_a0b(-4HJGb#3XW9_|PAiyUA%#qD@!y^!0 zUS5h`7)1ut0fEBda0nzCfkwkY4>-$*&L(-o>8!0hh(!!-DvQjdxv^;sI+TY=vSWC# z2{0Hq4*eRRtDBzQH+VYh3kx702yc=b0;PyVxVj>KoWWx2c!D5b0{X`pEK{&d5yn&& z!-Gkt>UdJ=?5#gSP{`lryLm8O7Sf@R5mXndE9lAsS4I7_*R9F4K3!j-5P3Y?^@Vh^X1lrU%tO2y8ejQatKNN2H0bTX9(1%fNmKpd

    Y!R3*vf$EbKv6c9?q9*x4G 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 P&@iM4ja2WMkeKx^mNH=T literal 0 HcmV?d00001 diff --git a/overrides/resourcepacks/icons/icon_48.png b/overrides/resourcepacks/icons/icon_48.png new file mode 100644 index 0000000000000000000000000000000000000000..4221b36d1443d30fd50211b6b25fa235813abb42 GIT binary patch literal 5152 zcmeHKdsGx<8y_UV<))<=rs=Xmh&sEov)7qe6UFBCj>!0YL!w4?ug?%+#USJ59?k7Zl{*TCD?UD2G?q{(2SAd+Ow<_ zm&#;l2+C|QX~TR^a=pL!eXYW!6*|whH>i7#7axU~s|yY&mvo%-;WXap^IY#6JzgFk zvM^e_uRn2^Q`*sO^ZIRK zX^b*z!3f=mVVX%ibV_e6nmzVlh-3vUJzaqQg>FSmPi4&-B+6#hQUS}dAwCae62l;?3w&ZM3s7}rt ze|qt}&!)`xcu}?VoOWx+Hr_is)<*8rHhAvEix%Ar5Hl*>qVaB5b5~7#Yre;`$uB>@ z$Sv%)>!~ZJ)pe24y^D1zPhUU2bVk#)?C+{vUyoY7i;nl!O1@SFx9a&vdG4>&tqJSm zddKQNDz2GkXu+y~Zn=Kz<$~m_k{;H3vfFzu(>KV^*iZ6a2`;X$v|s2s6|ms_(XDJN zXBA)7doHd12ib+7HEzXY(Tbn2){*-YZYCXGl~}LM+nG0M?e5s>d^WM=%hQQ_FDKk8 z?p=L6_u!Tmyf!v)-A;jx09zklw>PhSeT1t(e%D{`*t6XSl{MY+P)D4wRH#ZCuzk+`qw{ zU*5R+OOHiALz7~T7*y}H?Fol>aDtHMREjPkqqqt(en2*4bnM^v$o9@XCwHat!r;Hka z04oJA#csFa0zpPb20uf@x7d;eLJY$M2r58P7+An;mf22Z!e(}o1EL>8NwK7jvDz7n znd`tL^p-Tcg2w}T?t}PDR*hy5-pmfL0QeAO5>|nbj|faA!B7v@9+?h61_Jt94>k^r zsX#}umNXklMW$0``=p@|26E8fnr1UP(=m_&%1D`jDGPQLKCpauh}g zkpvdgm;sg}B0VfYQ9?@4BqEnmLm*;o4CqS2I5a8;l)(W-qe2Wdkg!Nj6R=n+M_`O3 z!4s{g^+E*0NCI_28Av?JVlxq-oQ#P`rUX`VvQyz891qi~6+D!WJd|jSgq;QsU5!i$DLIsWk@j)>|1%D}bzrm0b z6wuNy11B>$=mmo({QzGe)_?Ld&}RSS7F_O=O&*KiCv-ib>#-PkEaNBL^@Og+V&Jii zpLEy%j4scI?~0Te{K3lrZ-O~_KW2fqNO%40SxV?n$Ms>=&i82ZVO>pqTiU-3a41P$v@E5qVanmRXKTrw(l^qCbI^r@n!HWVcmM3s7# zj*CC?@e9MZc^wbFR8_swt9fSoh2*7;Q&fArPDd8{c}j!cQqS8zms9!PEuQFnuf|eS z69}`im0xeF>HdA|FUvFdqf@JAm))5)^~IisENOOz#b*o(UG1L!VGP2)rfUfE54m6H zo8rX@aLa5ryS-5F^V+*Fadzy`!5f|l)z;h>-;T}QvOyH8Ta)l}5j^a3qf1Tn_Ep|F zY=v*ql7(B+cU@}##Lrrh?-4obS(nk^T9i9#Q%rcU`iIp;uHmuasqE%cqVtR&XRn_^ z`;@irhpzh<-*D#!eV2Xd%*_+cf|5Ho7p5BGqQBo=J!hM{P_-*>V_O%K`R%g4cg?kz zM`}MkwsYOMH?<>mC;Ebq{?rgl?>?Hncz5|{^hfdYvFE)e)gOpbPW}A3i-&^8{DvGc zRV`~tsMmGKp^&p_pDYa}znGKPIe%yqBvL?s%z(CNO;X)mLgx z-X)+3#yDbRWudtYJ*IC=zIE@bxl<=%eW`~6`uuJ~O)2T$TiaVJMtv>iFMs3hu6AZz zLd|z`OF2&*1d&I#ZfVa#P5Rqryzg0COi!n7@NgS j^6Wj`TRix^@p&tBH=o_5PHPVaqX4NR=PJv?lXCwJTK;wg literal 0 HcmV?d00001 diff --git a/overrides/scripts/normal/AppliedEnergistics.zs b/overrides/scripts/normal/AppliedEnergistics.zs index 04f38030..c3b030ee 100644 --- a/overrides/scripts/normal/AppliedEnergistics.zs +++ b/overrides/scripts/normal/AppliedEnergistics.zs @@ -1217,9 +1217,9 @@ assembler.recipeBuilder() # ME Drive recipes.remove(); recipes.addShaped(, [ - [, , ], + [, , ], [, , ], - [, , ] + [, , ] ]); assembler.recipeBuilder() .circuit(1) @@ -1228,7 +1228,7 @@ assembler.recipeBuilder() , , , - * 2 + * 2 ]) .outputs([]) .duration(100) From 5215a3cf57cfed97244b0ba6baaa60edef594a88 Mon Sep 17 00:00:00 2001 From: tier940 Date: Thu, 14 Sep 2023 16:50:17 +0900 Subject: [PATCH 04/15] # Update mod - TOPCE --- CHANGELOG_v2.md | 1 + manifest.json | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG_v2.md b/CHANGELOG_v2.md index f1a73de5..f87d6578 100644 --- a/CHANGELOG_v2.md +++ b/CHANGELOG_v2.md @@ -8,6 +8,7 @@ - GTExpert2 Core Mod - BisectHosting Server Integration Menu - LoliASM +- The One Probe Community Edition ## Add mod - Red Core diff --git a/manifest.json b/manifest.json index 75fef8e1..3585eed2 100644 --- a/manifest.json +++ b/manifest.json @@ -136,7 +136,7 @@ }, { "projectID": 885670, - "fileID": 4745095, + "fileID": 4746213, "required": true }, { @@ -634,6 +634,11 @@ "fileID": 4742905, "required": true }, + { + "projectID": 874067, + "fileID": 4683503, + "required": true + }, { "projectID": 910715, "fileID": 4749295, From 848b979db5c61c1af784205cceb9172be174277a Mon Sep 17 00:00:00 2001 From: tier940 Date: Thu, 14 Sep 2023 22:19:12 +0900 Subject: [PATCH 05/15] update cicd --- .github/workflows/preview.yml | 4 +-- .github/workflows/release.yml | 28 +++++++++---------- .../scripts/normal/AppliedEnergistics.zs | 6 ++-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 861976ad..b6baeff9 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get the version run: | @@ -30,7 +30,7 @@ jobs: unzip main.zip mv -vf ./gregtech-expert-2-questbook-main/* ./overrides/config/ftbquests/ rm -rf ./gregtech-expert-2-questbook-main/ ./main.zip - + - name: Archive Release CF run: | zip -r ./GTExpert2-${{ env.VERSION }}-pr-${{ env.PR_VERSION }}-cf.zip ./manifest.json ./modlist.html ./overrides/bansoukou/ ./overrides/config/ ./overrides/local/ ./overrides/resources/ ./overrides/scripts/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aff3bd36..ab082d22 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get the version run: | @@ -81,16 +81,16 @@ jobs: ./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-mmc.zip ./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-server.zip - - name: Upload Curseforge - uses: ./.github/actions/curseforge-modpack-upload - with: - api-token: ${{ secrets.CF_API_TOKEN }} - project-id: '565238' - modpack-path: ./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-cf.zip - modpack-server-path: ./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-server.zip - changelog: 'Check the changes here. [Github - CHANGELOG.md](https://github.com/GTModpackTeam/gregtech-expert-2/blob/main/CHANGELOG_v2.md "")' - changelog-format: markdown - game-version: '628' # 628 or 6756 (Accepted at either) - display-name: GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }} - server-display-name: GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-server - release-type: ${{ env.LEVEL }} + # - name: Upload Curseforge + # uses: ./.github/actions/curseforge-modpack-upload + # with: + # api-token: ${{ secrets.CF_API_TOKEN }} + # project-id: '565238' + # modpack-path: ./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-cf.zip + # modpack-server-path: ./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-server.zip + # changelog: 'Check the changes here. [Github - CHANGELOG.md](https://github.com/GTModpackTeam/gregtech-expert-2/blob/main/CHANGELOG_v2.md "")' + # changelog-format: markdown + # game-version: '628' # 628 or 6756 (Accepted at either) + # display-name: GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }} + # server-display-name: GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-server + # release-type: ${{ env.LEVEL }} diff --git a/overrides/scripts/normal/AppliedEnergistics.zs b/overrides/scripts/normal/AppliedEnergistics.zs index c3b030ee..6396eb20 100644 --- a/overrides/scripts/normal/AppliedEnergistics.zs +++ b/overrides/scripts/normal/AppliedEnergistics.zs @@ -1217,9 +1217,9 @@ assembler.recipeBuilder() # ME Drive recipes.remove(); recipes.addShaped(, [ - [, , ], + [, , ], [, , ], - [, , ] + [, , ] ]); assembler.recipeBuilder() .circuit(1) @@ -1228,7 +1228,7 @@ assembler.recipeBuilder() , , , - * 2 + * 2 ]) .outputs([]) .duration(100) From e892e170a4bdd6b9298076bbf8babd3cbe4577dd Mon Sep 17 00:00:00 2001 From: tier940 Date: Thu, 14 Sep 2023 23:09:19 +0900 Subject: [PATCH 06/15] Update mod - MixinBooter --- CHANGELOG_v2.md | 1 + manifest.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG_v2.md b/CHANGELOG_v2.md index f87d6578..8fbf3d90 100644 --- a/CHANGELOG_v2.md +++ b/CHANGELOG_v2.md @@ -9,6 +9,7 @@ - BisectHosting Server Integration Menu - LoliASM - The One Probe Community Edition +- MixinBooter ## Add mod - Red Core diff --git a/manifest.json b/manifest.json index 3585eed2..c2a8556e 100644 --- a/manifest.json +++ b/manifest.json @@ -391,7 +391,7 @@ }, { "projectID": 419286, - "fileID": 4699275, + "fileID": 4750909, "required": true }, { From eec245e38468b533f9d17c282e90c89550f264f3 Mon Sep 17 00:00:00 2001 From: tier940 Date: Thu, 14 Sep 2023 23:36:47 +0900 Subject: [PATCH 07/15] revert --- overrides/scripts/normal/AppliedEnergistics.zs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/overrides/scripts/normal/AppliedEnergistics.zs b/overrides/scripts/normal/AppliedEnergistics.zs index 6396eb20..04f38030 100644 --- a/overrides/scripts/normal/AppliedEnergistics.zs +++ b/overrides/scripts/normal/AppliedEnergistics.zs @@ -1217,9 +1217,9 @@ assembler.recipeBuilder() # ME Drive recipes.remove(); recipes.addShaped(, [ - [, , ], + [, , ], [, , ], - [, , ] + [, , ] ]); assembler.recipeBuilder() .circuit(1) @@ -1228,7 +1228,7 @@ assembler.recipeBuilder() , , , - * 2 + * 2 ]) .outputs([]) .duration(100) From 1ff9ad43f7065e7cfeeb4d06726febe4e0e365f8 Mon Sep 17 00:00:00 2001 From: tier940 Date: Thu, 14 Sep 2023 23:41:51 +0900 Subject: [PATCH 08/15] Update CHANGELOG_v2.md --- CHANGELOG_v2.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG_v2.md b/CHANGELOG_v2.md index 8fbf3d90..1a4d3d7a 100644 --- a/CHANGELOG_v2.md +++ b/CHANGELOG_v2.md @@ -1,4 +1,8 @@ # v2.5.5 +## Modpack information +- All blocks of Chisel are now supported by Auto Chisel. + - Thanks to @MrKono for his support!! + ## Update mods - CraftPresence - ModularUI From bdfdeb4f80dde5ed93534ca3368f8a7fb41c376f Mon Sep 17 00:00:00 2001 From: tier940 Date: Fri, 15 Sep 2023 11:03:21 +0900 Subject: [PATCH 09/15] Update mods - CraftPresence - Inventory Bogo Sorter - GTExpert2 Core Mod - MixinBooter --- manifest.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index c2a8556e..1b371012 100644 --- a/manifest.json +++ b/manifest.json @@ -31,7 +31,7 @@ }, { "projectID": 632327, - "fileID": 4750417, + "fileID": 4752339, "required": true }, { @@ -171,7 +171,7 @@ }, { "projectID": 297038, - "fileID": 4720396, + "fileID": 4752213, "required": true }, { @@ -391,7 +391,7 @@ }, { "projectID": 419286, - "fileID": 4750909, + "fileID": 4752579, "required": true }, { @@ -586,7 +586,7 @@ }, { "projectID": 851103, - "fileID": 4746844, + "fileID": 4752230, "required": true }, { From e4b9f8d2667a4822ffe74e50dda57205f4b336f8 Mon Sep 17 00:00:00 2001 From: tier940 Date: Fri, 15 Sep 2023 12:22:55 +0900 Subject: [PATCH 10/15] fix cfg --- .github/workflows/preview.yml | 2 +- .github/workflows/release.yml | 2 +- .../AppliedEnergistics2.cfg | 18 -- .../config/AppliedEnergistics2/Facades.cfg | 2 +- overrides/config/UniversalTweaks.cfg | 10 +- overrides/config/codechickenlib.cfg | 6 +- overrides/config/foamfix.cfg | 184 ------------------ overrides/config/forge.cfg | 2 +- overrides/config/loliasm.cfg | 2 +- overrides/config/tombmanygraves.cfg | 2 +- 10 files changed, 14 insertions(+), 216 deletions(-) delete mode 100644 overrides/config/foamfix.cfg diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index b6baeff9..dc89bae3 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -33,7 +33,7 @@ jobs: - name: Archive Release CF run: | - zip -r ./GTExpert2-${{ env.VERSION }}-pr-${{ env.PR_VERSION }}-cf.zip ./manifest.json ./modlist.html ./overrides/bansoukou/ ./overrides/config/ ./overrides/local/ ./overrides/resources/ ./overrides/scripts/ + zip -r ./GTExpert2-${{ env.VERSION }}-pr-${{ env.PR_VERSION }}-cf.zip ./manifest.json ./modlist.html ./overrides/bansoukou/ ./overrides/config/ ./overrides/local/ ./overrides/resourcepacks/icons/ ./overrides/resources/ ./overrides/scripts/ - name: Setup Python uses: actions/setup-python@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ab082d22..b4fc3970 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,7 +35,7 @@ jobs: - name: Archive Release CF run: | - zip -r ./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-cf.zip ./manifest.json ./modlist.html ./manifest.json ./modlist.html ./overrides/bansoukou/ ./overrides/config/ ./overrides/local/ ./overrides/resources/ ./overrides/scripts/ + zip -r ./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-cf.zip ./manifest.json ./modlist.html ./manifest.json ./modlist.html ./overrides/bansoukou/ ./overrides/config/ ./overrides/local/ ./overrides/resourcepacks/icons/ ./overrides/resources/ ./overrides/scripts/ - name: Setup Python uses: actions/setup-python@v4 diff --git a/overrides/config/AppliedEnergistics2/AppliedEnergistics2.cfg b/overrides/config/AppliedEnergistics2/AppliedEnergistics2.cfg index df0d58d8..255ad840 100644 --- a/overrides/config/AppliedEnergistics2/AppliedEnergistics2.cfg +++ b/overrides/config/AppliedEnergistics2/AppliedEnergistics2.cfg @@ -63,26 +63,16 @@ blockingmode { gregtech:shape.extruder.wire gregtech:shape.extruder.pipe.tiny gregtech:shape.extruder.pipe.small - gregtech:shape.extruder.pipe.medium gregtech:shape.extruder.pipe.normal gregtech:shape.extruder.pipe.large gregtech:shape.extruder.pipe.huge gregtech:shape.extruder.block - gregtech:shape.extruder.sword - gregtech:shape.extruder.pickaxe - gregtech:shape.extruder.shovel - gregtech:shape.extruder.axe - gregtech:shape.extruder.hoe - gregtech:shape.extruder.hammer - gregtech:shape.extruder.file - gregtech:shape.extruder.saw gregtech:shape.extruder.gear gregtech:shape.extruder.bottle gregtech:shape.extruder.foil gregtech:shape.extruder.gear_small gregtech:shape.extruder.rod_long gregtech:shape.extruder.rotor - gregtech:glass_lens.white gregtech:glass_lens.orange gregtech:glass_lens.magenta gregtech:glass_lens.light_blue @@ -123,14 +113,6 @@ blockingmode { ore:lensVinteum ore:lensNetherQuartz ore:lensNetherStar - gregtechfoodoption:wooden_form.bun - gregtechfoodoption:wooden_form.bread - gregtechfoodoption:wooden_form.baguette - gregtechfoodoption:config.slicer_blade.flat - gregtechfoodoption:config.slicer_blade.stripes - gregtechfoodoption:config.slicer_blade.octagonal - gregtechfoodoption:component.cheddar_curd_mold - gregtechfoodoption:component.aged_cheddar_mold > } diff --git a/overrides/config/AppliedEnergistics2/Facades.cfg b/overrides/config/AppliedEnergistics2/Facades.cfg index 0fda134d..7c62decc 100644 --- a/overrides/config/AppliedEnergistics2/Facades.cfg +++ b/overrides/config/AppliedEnergistics2/Facades.cfg @@ -13,7 +13,7 @@ common { # Unsupported: Allows whitelisting TileEntity as facades. Could work, have render issues, or corrupt your world. USE AT YOUR OWN RISK. - B:allowTileEntityFacades=true + B:allowTileEntityFacades=false } diff --git a/overrides/config/UniversalTweaks.cfg b/overrides/config/UniversalTweaks.cfg index 66b36dcf..04d3b81c 100644 --- a/overrides/config/UniversalTweaks.cfg +++ b/overrides/config/UniversalTweaks.cfg @@ -147,7 +147,7 @@ general { "model gap" { # Fixes transparent gaps in all 3D models of blocks and items - B:"[1] Model Gap Toggle"=true + B:"[1] Model Gap Toggle"=false # Quad X/Y offset # Moves the quad toward the center of the item @@ -192,7 +192,7 @@ general { # Enables debug logging B:"Debug Logging"=false - B:"Obsolete Mods Screen"=true + B:"Obsolete Mods Screen"=false # Prints the time the game needed to launch to the log B:"Show Loading Time"=true @@ -732,7 +732,7 @@ general { attributes { # Sets custom ranges for entity attributes - B:"[01] Attributes Toggle"=true + B:"[01] Attributes Toggle"=false D:"[02] Max Health Min"=-65536.0 D:"[03] Max Health Max"=65536.0 D:"[04] Follow Range Min"=-65536.0 @@ -1311,7 +1311,7 @@ general { I:"Auto Save Interval"=900 # Improves model load times by checking if an animated model exists before trying to load it - B:"Check Animated Models"=true + B:"Check Animated Models"=false # Adds an IRecipe cache to improve recipe performance in larger modpacks B:"Crafting Cache"=true @@ -1320,7 +1320,7 @@ general { B:"Disable Audio Debug"=true # Improves rendering performance by removing the resource location text on missing models - B:"Disable Fancy Missing Model"=true + B:"Disable Fancy Missing Model"=false # Replaces color lookup for sheep to check a predefined table rather than querying the recipe registry B:"Fast Dye Blending"=true diff --git a/overrides/config/codechickenlib.cfg b/overrides/config/codechickenlib.cfg index 0d9ca7cd..4492a674 100644 --- a/overrides/config/codechickenlib.cfg +++ b/overrides/config/codechickenlib.cfg @@ -1,12 +1,12 @@ "client" { #With this enabled, CCL will catch all exceptions thrown whilst rendering blocks. #If an exception is caught, the block will not be rendered. - B:"catchBlockRenderExceptions"=true + B:"catchBlockRenderExceptions"=false #With this enabled, CCL will catch all exceptions thrown whilst rendering items. #By default CCL will only enhance the crash report, but with 'attemptRecoveryOnItemRenderException' enabled # CCL will attempt to recover after the exception. - B:"catchItemRenderExceptions"=true + B:"catchItemRenderExceptions"=false #With this enabled, CCL will attempt to recover item rendering after an exception is thrown. #It is recommended to only enable this when a mod has a known bug and a fix has not been released yet. @@ -19,5 +19,5 @@ #With this enabled, CCL will message the player upon an exception from rendering blocks or items. #Messages are Rate-Limited to one per 5 seconds in the event that the exception continues. - B:"messagePlayerOnRenderCrashCaught"=true + B:"messagePlayerOnRenderCrashCaught"=false } diff --git a/overrides/config/foamfix.cfg b/overrides/config/foamfix.cfg deleted file mode 100644 index f2dd90e2..00000000 --- a/overrides/config/foamfix.cfg +++ /dev/null @@ -1,184 +0,0 @@ -# Configuration file - -client { - # Clears caches on world unload a bit faster than usual. Prevents temporary memory leaks. More effective in Anarchy. [default: true] - B:clearCachesOnWorldUnload=true - - # Clears the baked models generated in the first pass *before* entering the second pass, instead of *after*. While this doesn't reduce memory usage in-game, it does reduce it noticeably during loading. [default: true] - B:clearDuplicateModelRegistry=true - - # Deduplicates IModels too. Takes a few seconds more, but shaves off another bit of RAM. [default: true] - B:deduplicateModelBakers=true - - # Deduplicates baked models. The original feature. [default: true] - B:deduplicateModels=true - - # The maximum amount of levels of recursion for the deduplication process. Smaller values will deduplicate less data, but make the process run faster. [default: 9, range: 1-2147483647] - I:deduplicateModelsMaxRecursion=9 - - # Step every X models on the progress bar while deduplicating baked models. [default: 1, range: 1-10000] - I:deduplicateModelsStepEvery=1 - - # Disables texture animations. [default: false] - B:disableTextureAnimations=false - - # Initialize the options.txt and forge.cfg files with rendering performance-friendly defaults if not present. [default: true] - B:initOptions=true - - # Makes vanilla creative tab search use JEI's lookups - saves a lot of RAM *and* gives you fancy JEI features! [default: true] - B:jeiCreativeSearch=true - - # Remove unnecessary data from a pointlessly cached ModelLoader instance. [default: true] - B:modelLoaderCleanup=true - - # Faster/less memory-churning construction mechanism for ModelResourceLocation objects. Identified by malte0811 in FerriteCore - implemented in a distinct way. [default: true] - B:modelResourceLocationFastConstruct=true - - # Fix opening URLs on Linux-based installs. [default: true] - B:openUrlLinux=true - B:smallModelConditions=true - - # More optimized multipart model condition storage. Inspired by malte0811's research. Now not broken! [default: true] - B:smallModelConditionsV2=true - - # Wipes the IModel cache after baking is finished. Saves a lot of RAM, as most IModels will not be reloaded. [default: true] - B:wipeModelCache=true -} - - -coremod { - # Stops certain non-Minecraft-related libraries from being ASM transformed. You shouldn't be transforming those anyway. [default: true] - B:blacklistLibraryTransformers=true - - # Make 3D forms of items be rendered dynamically and cached when necessary. [default: true] - B:dynamicItemModels=true - - # Optimizes ItemStack.isEmpty by removing a map lookup. Initially found by Aikar (Paper/0181). [default: true] - B:fasterAirItemLookup=true - - # Speeds up entity lookup by optimizing ClassInheritanceMultiMap.getByClass. [default: true] - B:fasterEntityLookup=true - - # Speeds up the hopper's calculations. [default: true] - B:fasterHopper=true - - # Optimizes blockstate property equals and hashCode methods. [default: true] - B:fasterPropertyComparisons=true - - # Fixes the server not removing unloaded entities/tile entities if no chunkloaders are active. Thanks to CreativeMD for finding this! [default: true] - B:fixWorldEntityCleanup=true - - # Disables all coremod functionality. [default: false] - B:forceDisable=false - - # The amount of ticks per player presence check for mob spawners. Set to 1 to disable the patch and match vanilla behaviour. [default: 10, range: 1-200] - I:mobSpawnerCheckSpeed=10 - - # Optimizes BlockPos mutable/immutable getters to run on the same variables, letting them be inlined and thus theoretically increasing performance. [default: true] - B:optimizedBlockPos=true - - # Fix a bug in chunk serialization leading to crashes. Originally found and fixed by Aaron1011 of Sponge. [default: true] - B:patchChunkSerialization=true - - # Replaces the default BlockState/ExtendedBlockState implementations with a far more memory-efficient variant. [default: true] - B:smallPropertyStorage=true -} - - -debug { - # Should FoamFix count and list baked models during deduplication, per mod? [default: false] - B:countListBakedModels=false -} - - -experimental { - # Optimizes the backing map for EntityDataManager, saving memory *and* CPU time! May cause issues, however - please test and report back! [default: false] - B:fasterEntityDataManager=false - - # Unpacks all baked quads. Increases RAM usage, but might speed some things up. [default: false] - B:unpackBakedQuads=false -} - - -general { - # Enable deduplication of redundant objects in memory. [default: true] - B:deduplicate=true -} - - -ghostbuster { - # Checks if worlds do not unload after a specified amount of time, and notifies the user if that is the case. [default: true] - B:checkNonUnloadedWorldClients=true - - # The amount of time FoamFix should wait for a world to be deemed non-unloaded. [default: 60, range: 10-3600] - I:checkNonUnloadedWorldTimeout=60 - - # Custom patch rules. Format: 'className;methodName;accessAloadPos;posAloadPos;radius'. An AloadPos is the position of the argument in the method - 1 for the first one, 2 for the second one, ...; the radius determines how many blocks have to be around the method for no early return. Untested - please use with care. - S:customPatchRulesRadius < - > - - # Wrap ChunkProviderServers to be able to provide the /ghostbuster command for debugging ghost chunkloads. [default: false] - B:enableDebuggingWrapper=false - - # For FoamFix debugging/development purposes only. [default: false] - B:nonUnloadedWorldsForceGCOnCheck=false - - # Should beds be prevented from ghost chunkloading? [default: true] - B:patchBeds=true - - # Should BoP grass be prevented from ghost chunkloading? [default: true] - B:patchBopGrass=true - - # Should farmland be prevented from ghost chunkloading? [default: true] - B:patchFarmland=true - - # Should fluids be prevented from ghost chunkloading? [default: true] - B:patchFluids=true - - # Should the /ghostbuster debugger show neighbor updates? [default: false] - B:wrapperShowsNeighborUpdates=false -} - - -launchwrapper { - # Remove Launchwrapper package manifest map (which is not used anyway). [default: true] - B:removePackageManifestMap=true - - # Weaken LaunchWrapper's byte[] resource cache to make it cleanuppable by the GC. Safe. [default: true] - B:weakenResourceCache=true -} - - -network { - # Enable micro-optimizations to reduce network churn, inspired by the Velocity project and Krypton mod. [default: true] - B:microOptimizations=true - - # Set the packet compression level, from 0 to 9. -1 preserves the default settings. [default: -1, range: -1-9] - I:packetCompressionLevel=-1 -} - - -textures { - # If false, disables any patches from this category. [default: true] - B:enable=true - - # Controls the faster animation path. 0 - disable, 2 - force enable, 1 (default) - enable on devices which have been shown to benefit from it. [default: 1, range: 0-2] - I:fasterAnimation=1 - - # The maximum amount of frames an animation can have for it to be cached. If you have a lot of VRAM, set higher. [default: 256, range: 0-2147483647] - I:maxAnimationFramesForCache=256 - - # Set to a number to disable animation updates past that mip level. -1 means update all. Higher numbers update more levels. To disable animation updates altogether, use the option for it. [default: -1, range: -1-4] - I:maxAnimationMipLevel=-1 -} - - -tweaks { - # Prevent redstone from causing light updates by removing its light level. [default: false] - B:disableRedstoneLight=false - - # Do not delay lighting updates over other types of updates. [default: false] - B:immediateLightingUpdates=false -} - - diff --git a/overrides/config/forge.cfg b/overrides/config/forge.cfg index 149b27ca..5c2acf31 100644 --- a/overrides/config/forge.cfg +++ b/overrides/config/forge.cfg @@ -38,7 +38,7 @@ client { > # Enable the forge block rendering pipeline - fixes the lighting of custom models. - B:forgeLightPipelineEnabled=true + B:forgeLightPipelineEnabled=false # When enabled, makes specific reload tasks such as language changing quicker to run. B:selectiveResourceReloadEnabled=false diff --git a/overrides/config/loliasm.cfg b/overrides/config/loliasm.cfg index 699203ab..14e9d75a 100644 --- a/overrides/config/loliasm.cfg +++ b/overrides/config/loliasm.cfg @@ -45,7 +45,7 @@ canonicalization { B:lockCodeCanonicalization=true # Deduplicate Model Conditions. Enable this if you do not have Foamfix installed - - B:modelConditionCanonicalization=false + B:modelConditionCanonicalization=true # Deduplicate String keys in NBTTagCompound - B:nbtBackingMapStringCanonicalization=true diff --git a/overrides/config/tombmanygraves.cfg b/overrides/config/tombmanygraves.cfg index cb822e6b..fcdaeebd 100644 --- a/overrides/config/tombmanygraves.cfg +++ b/overrides/config/tombmanygraves.cfg @@ -83,7 +83,7 @@ listconfigs { logs { # If true, the server log will print the location of a player's death each time they die. (Defaults to true) - B:printDeathLog=true + B:printDeathLog=false } From c2587f971b8c0ec51e8713099d663c64c8b18ec3 Mon Sep 17 00:00:00 2001 From: tier940 Date: Sat, 16 Sep 2023 11:16:42 +0900 Subject: [PATCH 11/15] fix cfg --- CHANGELOG_v2.md | 6 +++--- overrides/config/codechickenlib.cfg | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG_v2.md b/CHANGELOG_v2.md index 1a4d3d7a..7feed4f8 100644 --- a/CHANGELOG_v2.md +++ b/CHANGELOG_v2.md @@ -12,20 +12,20 @@ - GTExpert2 Core Mod - BisectHosting Server Integration Menu - LoliASM -- The One Probe Community Edition - MixinBooter ## Add mod - Red Core ## Remove mods -- It's the little things - Spark Unforged -- Phosphor Crash Fix ## Move mods +- The One Probe -> The One Probe Community Edition +- It's the little things -> Valkyrie - VintageFix -> Valkyrie - Phosphor -> Alfheim Lighting Engine +- Phosphor Crash Fix -> Alfheim Lighting Engine * * * diff --git a/overrides/config/codechickenlib.cfg b/overrides/config/codechickenlib.cfg index 4492a674..0d9ca7cd 100644 --- a/overrides/config/codechickenlib.cfg +++ b/overrides/config/codechickenlib.cfg @@ -1,12 +1,12 @@ "client" { #With this enabled, CCL will catch all exceptions thrown whilst rendering blocks. #If an exception is caught, the block will not be rendered. - B:"catchBlockRenderExceptions"=false + B:"catchBlockRenderExceptions"=true #With this enabled, CCL will catch all exceptions thrown whilst rendering items. #By default CCL will only enhance the crash report, but with 'attemptRecoveryOnItemRenderException' enabled # CCL will attempt to recover after the exception. - B:"catchItemRenderExceptions"=false + B:"catchItemRenderExceptions"=true #With this enabled, CCL will attempt to recover item rendering after an exception is thrown. #It is recommended to only enable this when a mod has a known bug and a fix has not been released yet. @@ -19,5 +19,5 @@ #With this enabled, CCL will message the player upon an exception from rendering blocks or items. #Messages are Rate-Limited to one per 5 seconds in the event that the exception continues. - B:"messagePlayerOnRenderCrashCaught"=false + B:"messagePlayerOnRenderCrashCaught"=true } From ae221644b7073cc20ea140275705d889743b0f2b Mon Sep 17 00:00:00 2001 From: tier940 Date: Fri, 22 Sep 2023 19:08:59 +0900 Subject: [PATCH 12/15] fix and revert mods --- CHANGELOG_v2.md | 10 +- manifest.json | 27 +++-- modlist.html | 9 +- overrides/config/Valkyrie.cfg | 58 ----------- overrides/config/entityculling.cfg | 92 ++++++++++++++++++ overrides/config/forge.cfg | 2 +- overrides/config/itlt.cfg | 43 ++++++++ .../icon_128.png => config/itlt/icon.png} | Bin overrides/config/loliasm.cfg | 2 +- overrides/config/nothirium.cfg | 13 +++ overrides/config/phosphor.json | 4 + overrides/config/renderlib.cfg | 51 ++++++++++ overrides/config/vintagefix.properties | 23 +++++ overrides/resourcepacks/icons/icon_16.png | Bin 4563 -> 0 bytes overrides/resourcepacks/icons/icon_256.png | Bin 7612 -> 0 bytes overrides/resourcepacks/icons/icon_32.png | Bin 5083 -> 0 bytes overrides/resourcepacks/icons/icon_48.png | Bin 5152 -> 0 bytes serverfiles/docker-compose.yml | 2 +- 18 files changed, 261 insertions(+), 75 deletions(-) delete mode 100644 overrides/config/Valkyrie.cfg create mode 100644 overrides/config/entityculling.cfg create mode 100644 overrides/config/itlt.cfg rename overrides/{resourcepacks/icons/icon_128.png => config/itlt/icon.png} (100%) create mode 100644 overrides/config/nothirium.cfg create mode 100644 overrides/config/phosphor.json create mode 100644 overrides/config/renderlib.cfg create mode 100644 overrides/config/vintagefix.properties delete mode 100644 overrides/resourcepacks/icons/icon_16.png delete mode 100644 overrides/resourcepacks/icons/icon_256.png delete mode 100644 overrides/resourcepacks/icons/icon_32.png delete mode 100644 overrides/resourcepacks/icons/icon_48.png diff --git a/CHANGELOG_v2.md b/CHANGELOG_v2.md index 7feed4f8..832ce8ca 100644 --- a/CHANGELOG_v2.md +++ b/CHANGELOG_v2.md @@ -15,17 +15,17 @@ - MixinBooter ## Add mod -- Red Core +- RenderLib +- Nothirium +- Entity Culling ## Remove mods - Spark Unforged ## Move mods - The One Probe -> The One Probe Community Edition -- It's the little things -> Valkyrie -- VintageFix -> Valkyrie -- Phosphor -> Alfheim Lighting Engine -- Phosphor Crash Fix -> Alfheim Lighting Engine +- Phosphor -> 燐/Hesperus +- Phosphor Crash Fix -> 燐/Hesperus * * * diff --git a/manifest.json b/manifest.json index 1b371012..05850e59 100644 --- a/manifest.json +++ b/manifest.json @@ -394,6 +394,11 @@ "fileID": 4752579, "required": true }, + { + "projectID": 232791, + "fileID": 3330021, + "required": true + }, { "projectID": 258881, "fileID": 2512758, @@ -499,6 +504,11 @@ "fileID": 4571247, "required": true }, + { + "projectID": 871198, + "fileID": 4753319, + "required": true + }, { "projectID": 876339, "fileID": 4592511, @@ -630,18 +640,23 @@ "required": true }, { - "projectID": 873867, - "fileID": 4742905, + "projectID": 624967, + "fileID": 4710694, + "required": true + }, + { + "projectID": 409087, + "fileID": 4620881, "required": true }, { - "projectID": 874067, - "fileID": 4683503, + "projectID": 624960, + "fileID": 4710696, "required": true }, { - "projectID": 910715, - "fileID": 4749295, + "projectID": 620262, + "fileID": 4724647, "required": true } ], diff --git a/modlist.html b/modlist.html index 337a0506..2e3960b4 100644 --- a/modlist.html +++ b/modlist.html @@ -75,6 +75,7 @@

  • Lazy AE2 (by phantamanta44)
  • Dynamistics (by Eutropium)
  • MixinBooter (by Rongmario)
    • +
  • It's the little things (by Zlepper)
  • Faster Ladder Climbing (by maddachshund)
  • Bansōkō [絆創膏] - Mod Patcher (by Rongmario)
  • FTB Library (Forge) (Legacy) (by FTB)
    • @@ -96,6 +97,7 @@
  • NetherPortalFix (by BlayTheNinth)
  • Item Filters (by LatvianModder)
  • Had Enough Items (by cleanroommc)
    • +
  • VintageFix (by embeddedt)
  • EnhancedP2P (by blacy1551)
  • dan's Mouse Tweaks (by cleanroommc)
  • CensoredASM (by Rongmario)
    • @@ -121,7 +123,8 @@
  • UntranslatedItems: AlsoFluids (by katatsumuri_pan)
  • EZStorage 2 Patch (by sjcl)
  • p455w0rd's AE2 Wireless Terminals Patch (by katatsumuri_pan)
    • -
  • Red Core (by Desoroxxx)
    • -
  • Valkyrie (by Desoroxxx)
    • -
  • Alfheim Lighting Engine (by Desoroxxx)
    • +
  • RenderLib (by meldexun)
    • +
  • Entity Culling (by meldexun)
    • +
  • Nothirium (by meldexun)
    • +
  • 燐/Hesperus (by kappa_maintainer)
    • diff --git a/overrides/config/Valkyrie.cfg b/overrides/config/Valkyrie.cfg deleted file mode 100644 index 8f4cc285..00000000 --- a/overrides/config/Valkyrie.cfg +++ /dev/null @@ -1,58 +0,0 @@ -# Configuration file - -general { - - general { - B:customIcons=true - B:highPrecisionDepthBuffer=true - S:windowTitle=GregTech Expert 2 - } - - zoom { - B:smoothCamera=false - B:smoothZoom=false - - # Min: 1.0 - # Max: 10.0 - D:smoothZoomSpeed=5.0 - - # Min: 1.0 - # Max: 10.0 - D:zoomMultiplier=3.0 - } - - clouds { - B:enabled=false - I:height=256 - I:layers=1 - - # Min: 4 - # Max: 2147483647 - I:renderDistance=32 - D:saturation=0.5 - } - - fog { - B:distanceFog=true - B:enabled=true - B:lavaFog=true - B:waterFog=true - } - - mc67532fix { - B:enabled=true - - # Min: 3 - # Max: 127 - I:offset=3 - } - - debug { - B:enabled=false - B:wireframeClouds=false - B:wireframeTerrain=false - } - -} - - diff --git a/overrides/config/entityculling.cfg b/overrides/config/entityculling.cfg new file mode 100644 index 00000000..6780d0da --- /dev/null +++ b/overrides/config/entityculling.cfg @@ -0,0 +1,92 @@ +# Configuration file + +general { + # Ideally should be set to equal the render distance. Ram usage (in Bytes) = 1063 * (2x + 1) ^ 3 + I:cacheSize=12 + B:disabledInSpectator=true + + # If you have a weak CPU enabling this option might help reducing the CPU usage. + B:enableRaytraceCache=false + + # Disable all changes from this mod (This is not equal to removing the mod!). + B:enabled=true + + # If enabled and OpenGl 4.4 is supported OpenGl based culling is used which is a lot faster and more accurate. If you have a weak GPU you might want to disable this. + B:openglBasedCulling=true + + # Mode that is used to calculate the distance from camera to a raytrace end point. + # Valid values: + # SPHERICAL + # CYLINDRICAL + S:raytraceDistanceCalculator=SPHERICAL + + # Used to calculate the raytrace distance limit. Points farther away than the limit are not raytraced. Distance limit = (renderDistance * 16 + adder) * multiplier + # Min: 0.0 + # Max: 1024.0 + D:raytraceDistanceLimitAdder=16.0 + + # Used to calculate the raytrace distance limit. Points farther away than the limit are not raytraced. Distance limit = (renderDistance * 16 + adder) * multiplier + # Min: 0.0 + # Max: 1024.0 + D:raytraceDistanceLimitMultiplier=1.0 + + # If you feel the need to increase this value because of entities being culled falsely then another modder probably messed up their render bounding boxes and you should report the issue to them. Alternatively you can use the (tile-)entityBoundingBoxGrowthList settings to fix bounding boxes on your own. + # Min: 0.0 + # Max: 1024.0 + D:raytraceThreshold=1.0 + + # If enabled tile entity bounding boxes are increased slightly to avoid issues when other mods don't correctly set their bounding boxes (requires opengl based culling). If you still have culling or flickering issues you can use the 'debugRenderBoxes', 'entityBoundingBoxGrowthList' and 'tileEntityBoundingBoxGrowthList' config options to try to fix the bounding box of that entity or tile entity. + B:tileEntityAABBGrowth=true + + entity { + B:alwaysRenderBosses=true + B:alwaysRenderEntitiesWithName=true + B:alwaysRenderPlayers=true + B:alwaysRenderViewEntity=true + + # Skip rendering of entities that are not visible (hidden behind blocks). This might cause issues where an entity is partly behind a block and thus does not get rendered but it's usually not really noticable. + B:skipHiddenEntityRendering=true + + # Tile entities which will always be rendered. (Accepts 'modid' or 'modid:entity_name') + S:skipHiddenEntityRenderingBlacklist < + > + + # Entities with a width or height greater than this value will always get rendered. + # Min: 0.0 + # Max: 1024.0 + D:skipHiddenEntityRenderingSize=16.0 + } + + tileentity { + # Skip rendering of entities that are not visible (hidden behind blocks). This might cause issues where a tile entity is partly behind a block and thus does not get rendered but it's usually not really noticable. + B:skipHiddenTileEntityRendering=true + + # Tile entities which will always be rendered. (Accepts 'modid' or 'modid:tile_entity_name') + S:skipHiddenTileEntityRenderingBlacklist < + enderio:tile_travel_anchor + > + + # Tile entities with a width or height greater than this value will always get rendered. + # Min: 0.0 + # Max: 1024.0 + D:skipHiddenTileEntityRenderingSize=16.0 + } + + optifineshaderoptions { + B:entityShadowsCulling=true + B:entityShadowsCullingLessAggressiveMode=true + + # Min: 0.0 + # Max: 1024.0 + D:entityShadowsCullingLessAggressiveModeDiff=4.0 + B:tileEntityShadowsCulling=true + B:tileEntityShadowsCullingLessAggressiveMode=true + + # Min: 0.0 + # Max: 1024.0 + D:tileEntityShadowsCullingLessAggressiveModeDiff=4.0 + } + +} + + diff --git a/overrides/config/forge.cfg b/overrides/config/forge.cfg index 5c2acf31..149b27ca 100644 --- a/overrides/config/forge.cfg +++ b/overrides/config/forge.cfg @@ -38,7 +38,7 @@ client { > # Enable the forge block rendering pipeline - fixes the lighting of custom models. - B:forgeLightPipelineEnabled=false + B:forgeLightPipelineEnabled=true # When enabled, makes specific reload tasks such as language changing quicker to run. B:selectiveResourceReloadEnabled=false diff --git a/overrides/config/itlt.cfg b/overrides/config/itlt.cfg new file mode 100644 index 00000000..b7bf436a --- /dev/null +++ b/overrides/config/itlt.cfg @@ -0,0 +1,43 @@ +# Configuration file + +bitdetection { + # If ShouldYellAt32BitUsers is set to true, this is the message that will be displayed to the user. + S:ErrorMessage=You are using a 32 bit version of java. This is not recommended with this modpack. + + # Set to true to make itlt yell at people attempting to use 32x java for the modpack. + B:ShouldYellAt32BitUsers=true +} + + +display { + # Set to true to make minecraft attempt to maximize itself on startup (This is kinda unstable right now, so don't trust it too much) + B:ShouldMaximizeDisplay=false + + # Set to true to load a custom icon from config\itlt\icon.png + B:loadCustomIcon=true + + # Set to true to attempt to get the display name of the pack of the info json file + # This will take priority over windowDisplayTitle + B:useTechnicDisplayName=false + + # Set to true to attempt to use the icon assigned to the modpack by the technic launcher. + # This will take priority over loadCustomIcon + B:useTechnicIcon=false + + # Change this value to change the name of the MineCraft window + S:windowDisplayTitle=GregTech Expert 2 +} + + +server { + # Set to true to have a dedicated server added to the server list ingame. The server will not overwrite others servers. + B:AddDedicatedServer=false + + # The ip of the dedicated server to add. + S:ServerIP=127.0.0.1:25555 + + # The name of the dedicated server to add. + S:ServerName=Localhost +} + + diff --git a/overrides/resourcepacks/icons/icon_128.png b/overrides/config/itlt/icon.png similarity index 100% rename from overrides/resourcepacks/icons/icon_128.png rename to overrides/config/itlt/icon.png diff --git a/overrides/config/loliasm.cfg b/overrides/config/loliasm.cfg index 14e9d75a..699203ab 100644 --- a/overrides/config/loliasm.cfg +++ b/overrides/config/loliasm.cfg @@ -45,7 +45,7 @@ canonicalization { B:lockCodeCanonicalization=true # Deduplicate Model Conditions. Enable this if you do not have Foamfix installed - - B:modelConditionCanonicalization=true + B:modelConditionCanonicalization=false # Deduplicate String keys in NBTTagCompound - B:nbtBackingMapStringCanonicalization=true diff --git a/overrides/config/nothirium.cfg b/overrides/config/nothirium.cfg new file mode 100644 index 00000000..ffc3463e --- /dev/null +++ b/overrides/config/nothirium.cfg @@ -0,0 +1,13 @@ +# Configuration file + +general { + # Valid values: + # AUTOMATIC + # GL43 + # GL42 + # GL20 + # GL15 + S:renderEngine=AUTOMATIC +} + + diff --git a/overrides/config/phosphor.json b/overrides/config/phosphor.json new file mode 100644 index 00000000..e67c6859 --- /dev/null +++ b/overrides/config/phosphor.json @@ -0,0 +1,4 @@ +{ + "enable_illegal_thread_access_warnings": true, + "enable_phosphor": true +} diff --git a/overrides/config/renderlib.cfg b/overrides/config/renderlib.cfg new file mode 100644 index 00000000..39c77c87 --- /dev/null +++ b/overrides/config/renderlib.cfg @@ -0,0 +1,51 @@ +# Configuration file + +general { + B:debugRenderBoxes=false + + # Allows you to increase the render bounding boxes of entities (or all entities of a mod). Width increases the size on the X and Z axis. Top increases the size in the positive Y direction. Bottom increases the size in the negative Y direction. (Accepts 'modid=width,top,bottom' or 'modid:entity=width,top,bottom'). + S:entityBoundingBoxGrowthList < + > + I:mainMenuFPS=60 + + # If set to true the main menu FPS is synced to the in game FPS (but clamped between 30 and 240). + B:mainMenuFPSSynced=false + B:openGLLogExtensions=false + B:showFrameTimes=false + + # Allows you to increase the render bounding boxes of tile entities (or all entities of a mod). Width increases the size on the X and Z axis. Top increases the size in the positive Y direction. Bottom increases the size in the negative Y direction. (Accepts 'modid=width,top,bottom' or 'modid:tileentity=width,top,bottom'). + S:tileEntityBoundingBoxGrowthList < + > + + # Tile entities whose bounding boxes won't be cached (Accepts 'modid' or 'modid:tileentity'). + S:tileEntityCachedBoundingBoxBlacklist < + > + + # Most tile entities have static bounding boxes and thus they can be cached. Tile entities whose bounding boxes are likely to change every frame or so should be added to the blacklist. Tile entities whose bounding only change every once in a while should be covered by cache updates (update speed adjustable through tileEntityCachedBoundingBoxUpdateInterval) + B:tileEntityCachedBoundingBoxEnabled=true + + # Every frame there is a 1 in x chance to update the cached bounding box. Higher = better performance, Lower = tile entities with dynamic bounding boxes get updated faster. + # Min: 1 + # Max: 1000000 + I:tileEntityCachedBoundingBoxUpdateInterval=100 + + opengldebugoutput { + # Better debugging of OpenGL errors. Might not be supported by your hardware/driver. + B:enabled=false + + # Enable/Disable logging of high severity non-error messages. (You probably never want to enable this as a normal user) + B:logHighSeverity=false + + # Enable/Disable logging of low severity non-error messages. (You probably never want to enable this as a normal user) + B:logLowSeverity=false + + # Enable/Disable logging of medium severity non-error messages. (You probably never want to enable this as a normal user) + B:logMediumSeverity=false + + # Enable/Disable logging of notification severity non-error messages. (You probably never want to enable this as a normal user) + B:logNotificationSeverity=false + } + +} + + diff --git a/overrides/config/vintagefix.properties b/overrides/config/vintagefix.properties new file mode 100644 index 00000000..1d020f47 --- /dev/null +++ b/overrides/config/vintagefix.properties @@ -0,0 +1,23 @@ +# VintageFix config file + +mixin.backports.new_world_name=true +mixin.backports.white_button_text=true +mixin.blockstates=true +mixin.branding=true +mixin.bugfix.exit_freeze=true +mixin.bugfix.extrautils=false +mixin.bugfix.missing_edge_chunks=true +mixin.bugfix.tab_complete_ddos=true +mixin.dynamic_resources=true +mixin.dynamic_resources.background_item_bake=true +mixin.dynamic_resources.hide_model_exceptions=false +mixin.dynamic_structures=true +mixin.jar_discoverer_cache=true +mixin.mod_opts.agricraft=true +mixin.model_optimizations.dedup_baked_quad=true +mixin.model_optimizations.dedup_multipart=true +mixin.model_optimizations.dedup_quad_lists=true +mixin.model_optimizations.location_canon=true +mixin.model_optimizations.simpler_perspective_wrapper=true +mixin.resourcepacks=true +mixin.textures=true diff --git a/overrides/resourcepacks/icons/icon_16.png b/overrides/resourcepacks/icons/icon_16.png deleted file mode 100644 index 46cd4151b72a4b94daaa94bbe6746d988b799aaa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4563 zcmeHLd2kcw6<>$OHn#C-k^)Ww^?ES_23C7XvUZX1CE1n}VZ{jW5o)jYkT;gJLRwq0 z9VY=(Xaa4VrkM$bG#n;`GPq4}(ohEoF=ru=lupxzfe;T2wTTTaE>29syQr{Q@k6B@u$cpL-o;i5+mlz_lMQ&VDE+_Qdw8c|FmK?`GTf)-=!EbgOBq z?ZUP13SNq0?ag~%T@gpONw4&NRJr5EnU=+QnH%1}dcH(cctk$)NkLz7?VDR34z2vg z#h;tMs6YGs%|9gX499ZF>bKWF89(RbB7aifH|TUOHdfS-Ki6B;_6l^yzY>m%L2*z{Ft#aZY?>Y=9R>Y1iP7dDq9)gFE;9fG3PNjW(V zTTae!J|K&&4KJJXJ2Gb-D=&L@!M?;AO;^))=I>VPtjDKstk~W*y|fxX&==pVOHI@M za&6U-BQG8MZR5uMt%OZ&*3lH#_P-n}nz{d-R?Rt0 z9&g?CjC_{ed~1e#SE;+F{$Derzr#o4sU~j>TYjiy)R^8#= z%dl!+cxpNxShOwr!5uv@_Zq*r_~@~&w0UWon7Z;s*ST3YZ#=MXz0iVGr&>3s`sc+vj;eq&sR{G$( z{j0x)_&s~CK6d%C=C%1x-u~n1_JQ{Lf&M4j4<|oe7}#0lSl0U&Zz(7*6(T zSzdMt+OXFT8V`a@8DT%mRS63065Nu{jNE8HjKC6aMpo+WxZR&4R7&}E0byC)QYTke z#nC*Hu_VqEW&nU!P*^zZ_4tBJ*o;JQ8E~(PF$9j7C{<>p*zSOHBoKo1Yc=k?p|Bk;c95DS10EX?{bLW^TwFE-XAs90+N z$WTB(=n-^+V~Q0CLAg4>3Dz3Hr_31(!E+=2{_21yk`B*df=BQI(;(QD7`J7f&F&cS zP$_UrUVp?3kUh>)k;GB5#>J*;BI%3`1h|jjj~_W?bJc2iHj5ci_h)#S zlXxa_E0B7cBX}GoDN#Um0>z`O-XNj^tD{JsFt|jH9s_0b1r^rE2`Ur-*Gd3KG`dI@ z7dh0(u`X0+)Voj`H*hEbCJBR)r$l-zL}5SzUCDaJMx{dW0Lmbe1WocBN*P5K)ftR9 zN^=~z6J4TN%peg9F903Tt5%0f6Ep#o#nU=$wR}A&m@0ECfq@ zjJ?cDV(ovkR*w&C8Z3Ig6a@R%Mnr>WYMHQla5cE}NRh(?!;xdbu-sq@LAFNVBXI(( zK^0fY`rHDTA43g0ESG+u83@|IvFVh6iXKmlCB9cFd^f~?)tyc6*u~< zDEPn+ybyR2yu7?k{Wl}p^?05Ix~IOk9o+p2kWBUGmjodw{$ceK1vPI?0>T)@X1B&% zo0=FsD`nlOT@nzzVY6g8ji>khDl4uL*I3Kjb~mjn@?Y5BcV*RqX+5qFa__9FEPJ~W zx!sYu9?zh#DKS_7s@1;U)$r_38yAwV&GbsX;@Pvm{B?cG?vB~c=LUXO^!yghhP0Yf zJ7&U}Gaf7PEUDeI0ov0#_juCBAH0}S+Sl~q%l_1_RxkWw%Eo8uhY~{B7k;<)yERFl w-z_tp?k6fvZTs{9b@k9^_797@QrrKGy#p;j-!}03dJrmPvo5u?W>>8J4@h%m+yDRo diff --git a/overrides/resourcepacks/icons/icon_256.png b/overrides/resourcepacks/icons/icon_256.png deleted file mode 100644 index 3d04df52b4c67df40d608a1d6affd7648b8baf9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7612 zcmeHLc|4Ts+kZwy$yTY*Vw#B3m4unyZireg_|ZCJ&%mmJkb^%-}pAYU=?Lu zqj2-gy41rTXIHlDR(NimyyoL*@xj2UORm0t_hqz2kd+dznt;!Hc43UdC7lE$U*Cs@ z`%mh-K<9hdFn>r(hNUF!+NBXNxf3)kEkmM~*4KQ%ED{2u3H!@-ZG38LmAk`CKrLOB zlAbtp4Hl7lTIY^ovtSlJ-um-0J*gP+_4^*@c63zO)jfV{X(3>-TWkh!_i#66N3Wib z6F>aK+pRUyYihIC2*9}hr}%XRLHW##w0Ed2m#x;$WcQUpeUYc{R0_ePZC;dm_`fYH zYbab^!_=JWm53VSU!ueR%=0I`PtM_wM16`Lj45LzoKf-f zu{W$q={XhhWY67@R1tgGBU_TTh&(%efZKMf4BZQ_K9E{|c&ZB_)Kzyuseu-;H9}S< z>IASt`MlAwQ_Hh?dAYw)X^>s+^AfC){RU}auc2q@gS2s|20HChv?M5OyQ`t~EssoKqfQ=NEz@Rh= z0cN4BhtzY^qB_#{`!cB}zWSzQUuQCo0@KtGRQJY%0IpOv3F__YLTBN<39toRJb2GD zBVf=47q&A2c1X_NVZp-PHMib%MQH_a0b(-4HJGb#3XW9_|PAiyUA%#qD@!y^!0 zUS5h`7)1ut0fEBda0nzCfkwkY4>-$*&L(-o>8!0hh(!!-DvQjdxv^;sI+TY=vSWC# z2{0Hq4*eRRtDBzQH+VYh3kx702yc=b0;PyVxVj>KoWWx2c!D5b0{X`pEK{&d5yn&& z!-Gkt>UdJ=?5#gSP{`lryLm8O7Sf@R5mXndE9lAsS4I7_*R9F4K3!j-5P3Y?^@Vh^X1lrU%tO2y8ejQatKNN2H0bTX9(1%fNmKpd

    Y!R3*vf$EbKv6c9?q9*x4G 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 P&@iM4ja2WMkeKx^mNH=T diff --git a/overrides/resourcepacks/icons/icon_48.png b/overrides/resourcepacks/icons/icon_48.png deleted file mode 100644 index 4221b36d1443d30fd50211b6b25fa235813abb42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5152 zcmeHKdsGx<8y_UV<))<=rs=Xmh&sEov)7qe6UFBCj>!0YL!w4?ug?%+#USJ59?k7Zl{*TCD?UD2G?q{(2SAd+Ow<_ zm&#;l2+C|QX~TR^a=pL!eXYW!6*|whH>i7#7axU~s|yY&mvo%-;WXap^IY#6JzgFk zvM^e_uRn2^Q`*sO^ZIRK zX^b*z!3f=mVVX%ibV_e6nmzVlh-3vUJzaqQg>FSmPi4&-B+6#hQUS}dAwCae62l;?3w&ZM3s7}rt ze|qt}&!)`xcu}?VoOWx+Hr_is)<*8rHhAvEix%Ar5Hl*>qVaB5b5~7#Yre;`$uB>@ z$Sv%)>!~ZJ)pe24y^D1zPhUU2bVk#)?C+{vUyoY7i;nl!O1@SFx9a&vdG4>&tqJSm zddKQNDz2GkXu+y~Zn=Kz<$~m_k{;H3vfFzu(>KV^*iZ6a2`;X$v|s2s6|ms_(XDJN zXBA)7doHd12ib+7HEzXY(Tbn2){*-YZYCXGl~}LM+nG0M?e5s>d^WM=%hQQ_FDKk8 z?p=L6_u!Tmyf!v)-A;jx09zklw>PhSeT1t(e%D{`*t6XSl{MY+P)D4wRH#ZCuzk+`qw{ zU*5R+OOHiALz7~T7*y}H?Fol>aDtHMREjPkqqqt(en2*4bnM^v$o9@XCwHat!r;Hka z04oJA#csFa0zpPb20uf@x7d;eLJY$M2r58P7+An;mf22Z!e(}o1EL>8NwK7jvDz7n znd`tL^p-Tcg2w}T?t}PDR*hy5-pmfL0QeAO5>|nbj|faA!B7v@9+?h61_Jt94>k^r zsX#}umNXklMW$0``=p@|26E8fnr1UP(=m_&%1D`jDGPQLKCpauh}g zkpvdgm;sg}B0VfYQ9?@4BqEnmLm*;o4CqS2I5a8;l)(W-qe2Wdkg!Nj6R=n+M_`O3 z!4s{g^+E*0NCI_28Av?JVlxq-oQ#P`rUX`VvQyz891qi~6+D!WJd|jSgq;QsU5!i$DLIsWk@j)>|1%D}bzrm0b z6wuNy11B>$=mmo({QzGe)_?Ld&}RSS7F_O=O&*KiCv-ib>#-PkEaNBL^@Og+V&Jii zpLEy%j4scI?~0Te{K3lrZ-O~_KW2fqNO%40SxV?n$Ms>=&i82ZVO>pqTiU-3a41P$v@E5qVanmRXKTrw(l^qCbI^r@n!HWVcmM3s7# zj*CC?@e9MZc^wbFR8_swt9fSoh2*7;Q&fArPDd8{c}j!cQqS8zms9!PEuQFnuf|eS z69}`im0xeF>HdA|FUvFdqf@JAm))5)^~IisENOOz#b*o(UG1L!VGP2)rfUfE54m6H zo8rX@aLa5ryS-5F^V+*Fadzy`!5f|l)z;h>-;T}QvOyH8Ta)l}5j^a3qf1Tn_Ep|F zY=v*ql7(B+cU@}##Lrrh?-4obS(nk^T9i9#Q%rcU`iIp;uHmuasqE%cqVtR&XRn_^ z`;@irhpzh<-*D#!eV2Xd%*_+cf|5Ho7p5BGqQBo=J!hM{P_-*>V_O%K`R%g4cg?kz zM`}MkwsYOMH?<>mC;Ebq{?rgl?>?Hncz5|{^hfdYvFE)e)gOpbPW}A3i-&^8{DvGc zRV`~tsMmGKp^&p_pDYa}znGKPIe%yqBvL?s%z(CNO;X)mLgx z-X)+3#yDbRWudtYJ*IC=zIE@bxl<=%eW`~6`uuJ~O)2T$TiaVJMtv>iFMs3hu6AZz zLd|z`OF2&*1d&I#ZfVa#P5Rqryzg0COi!n7@NgS j^6Wj`TRix^@p&tBH=o_5PHPVaqX4NR=PJv?lXCwJTK;wg diff --git a/serverfiles/docker-compose.yml b/serverfiles/docker-compose.yml index 73ae1dbc..4b7a66dd 100644 --- a/serverfiles/docker-compose.yml +++ b/serverfiles/docker-compose.yml @@ -8,7 +8,7 @@ services: ports: - 25565:25565 environment: - JVM_OPTS: -Dfml.queryResult=confirm -XX:+UseContainerSupport -Dlog4j.configurationFile=log4j2_112-116.xml + JVM_OPTS: -Dfml.queryResult=confirm -XX:+UseContainerSupport -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Dlog4j.configurationFile=log4j2_112-116.xml USE_AIKAR_FLAGS: true EULA: true TYPE: AUTO_CURSEFORGE From 906fd45e3927fb153668b03fcbfbd124eaeef651 Mon Sep 17 00:00:00 2001 From: tier940 Date: Fri, 22 Sep 2023 20:36:42 +0900 Subject: [PATCH 13/15] Update mod - Inventory Bogo Sorter --- .github/workflows/release.yml | 81 +++++++++++-------- manifest.json | 2 +- .../config/AppliedEnergistics2/Facades.cfg | 2 +- overrides/config/UniversalTweaks.cfg | 8 +- 4 files changed, 53 insertions(+), 40 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b4fc3970..c85d8132 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,10 +1,29 @@ name: Deploy modpack + +permissions: + contents: write + deployments: write + on: - push: - tags: - - 'v*-release' - - 'v*-beta' - - 'v*-alpha' + workflow_dispatch: + inputs: + version: + description: 'Modpack version' + required: true + release_type: + description: 'Release type' + type: choice + default: 'release' + options: + - 'release' + - 'beta' + - 'alpha' + +env: + # Version of the mod + FULL_VERSION: "v${{ github.event.inputs.version }}-${{ github.event.inputs.release_type }}" + # type of release + NAME: "GTExpert2" jobs: deploy: @@ -13,18 +32,12 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Get the version - run: | - echo VERSION=$(echo ${GITHUB_REF} | sed -e 's#refs/tags/##g' | awk -F'-' '{print $1}') >> $GITHUB_ENV - echo LEVEL=$(echo ${GITHUB_REF} | sed -e 's#refs/tags/##g' | awk -F'-' '{print $2}') >> $GITHUB_ENV - - name: Set the version run: | - MODPACKVERSION=${{ env.VERSION }} - echo "GregTech Expert 2 ${MODPACKVERSION}-${{ env.LEVEL }}" > ./overrides/resources/custommainmenu/version.txt - sed -i -e "s/MODPACKVERSION/${MODPACKVERSION}/g" ./manifest.json - sed -i -e "s/MODPACKVERSION/${MODPACKVERSION}/g" ./instance.cfg - sed -i -e "s/MODPACKVERSION/${MODPACKVERSION}/g" ./overrides/config/craftpresence.json + echo "GregTech Expert 2 ${{ env.FULL_VERSION }}" > ./overrides/resources/custommainmenu/version.txt + sed -i -e "s/MODPACKVERSION/v${{ github.event.inputs.version }}/g" ./manifest.json + sed -i -e "s/MODPACKVERSION/v${{ github.event.inputs.version }}/g" ./instance.cfg + sed -i -e "s/MODPACKVERSION/v${{ github.event.inputs.version }}/g" ./overrides/config/craftpresence.json - name: Download quest zip run: | @@ -35,7 +48,7 @@ jobs: - name: Archive Release CF run: | - zip -r ./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-cf.zip ./manifest.json ./modlist.html ./manifest.json ./modlist.html ./overrides/bansoukou/ ./overrides/config/ ./overrides/local/ ./overrides/resourcepacks/icons/ ./overrides/resources/ ./overrides/scripts/ + zip -r ./${{ env.NAME }}-${{ env.FULL_VERSION }}-cf.zip ./manifest.json ./modlist.html ./manifest.json ./modlist.html ./overrides/bansoukou/ ./overrides/config/ ./overrides/local/ ./overrides/resourcepacks/icons/ ./overrides/resources/ ./overrides/scripts/ - name: Setup Python uses: actions/setup-python@v4 @@ -59,7 +72,7 @@ jobs: cp -vf ./icon.png .minecraft/ rm -rf .minecraft/mods/.gitkeep rm -rf .minecraft/resourcepacks/.gitkeep - zip -r ./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-mmc.zip ./mmc-pack.json ./instance.cfg .minecraft/ + zip -r ./${{ env.NAME }}-${{ env.FULL_VERSION }}-mmc.zip ./mmc-pack.json ./instance.cfg .minecraft/ - name: Move Server Files run: | @@ -68,7 +81,7 @@ jobs: - name: Archive Release Server run: | mv -vf .minecraft/* ./ - zip -r ./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-server.zip ./docker-compose.yml ./PleaseRead.txt ./log4j2_112-116.xml ./Install.bat ./Install.sh ./ServerStart.bat ./ServerStart.sh ./settings.bat ./settings.sh ./TmuxServer.sh ./bansoukou/ ./config/ ./local/ ./mods/ ./resources/ ./scripts/ + zip -r ./${{ env.NAME }}-${{ env.FULL_VERSION }}-server.zip ./docker-compose.yml ./PleaseRead.txt ./log4j2_112-116.xml ./Install.bat ./Install.sh ./ServerStart.bat ./ServerStart.sh ./settings.bat ./settings.sh ./TmuxServer.sh ./bansoukou/ ./config/ ./local/ ./mods/ ./resources/ ./scripts/ - name: Create GitHub Release uses: softprops/action-gh-release@v1 @@ -77,20 +90,20 @@ jobs: prerelease: false generate_release_notes: true files: | - ./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-cf.zip - ./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-mmc.zip - ./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-server.zip + ./${{ env.NAME }}-${{ env.FULL_VERSION }}-cf.zip + ./${{ env.NAME }}-${{ env.FULL_VERSION }}-mmc.zip + ./${{ env.NAME }}-${{ env.FULL_VERSION }}-server.zip - # - name: Upload Curseforge - # uses: ./.github/actions/curseforge-modpack-upload - # with: - # api-token: ${{ secrets.CF_API_TOKEN }} - # project-id: '565238' - # modpack-path: ./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-cf.zip - # modpack-server-path: ./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-server.zip - # changelog: 'Check the changes here. [Github - CHANGELOG.md](https://github.com/GTModpackTeam/gregtech-expert-2/blob/main/CHANGELOG_v2.md "")' - # changelog-format: markdown - # game-version: '628' # 628 or 6756 (Accepted at either) - # display-name: GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }} - # server-display-name: GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-server - # release-type: ${{ env.LEVEL }} + - name: Upload Curseforge + uses: henkelmax/upload-curseforge-modpack-action@v2.0.0 + with: + api-token: ${{ secrets.CF_API_TOKEN }} + project-id: '565238' + modpack-path: ./${{ env.NAME }}-${{ env.FULL_VERSION }}-cf.zip + modpack-server-path: ./${{ env.NAME }}-${{ env.FULL_VERSION }}-server.zip + changelog: 'Check the changes here. [Github - CHANGELOG.md](https://github.com/GTModpackTeam/gregtech-expert-2/blob/main/CHANGELOG_v2.md "")' + changelog-format: markdown + game-version: '1.12.2' + display-name: ${{ env.NAME }}-${{ env.FULL_VERSION }} + server-display-name: ${{ env.NAME }}-${{ env.FULL_VERSION }}-server + release-type: ${{ github.event.inputs.release_type }} diff --git a/manifest.json b/manifest.json index 05850e59..6ac0d456 100644 --- a/manifest.json +++ b/manifest.json @@ -31,7 +31,7 @@ }, { "projectID": 632327, - "fileID": 4752339, + "fileID": 4761867, "required": true }, { diff --git a/overrides/config/AppliedEnergistics2/Facades.cfg b/overrides/config/AppliedEnergistics2/Facades.cfg index 7c62decc..0fda134d 100644 --- a/overrides/config/AppliedEnergistics2/Facades.cfg +++ b/overrides/config/AppliedEnergistics2/Facades.cfg @@ -13,7 +13,7 @@ common { # Unsupported: Allows whitelisting TileEntity as facades. Could work, have render issues, or corrupt your world. USE AT YOUR OWN RISK. - B:allowTileEntityFacades=false + B:allowTileEntityFacades=true } diff --git a/overrides/config/UniversalTweaks.cfg b/overrides/config/UniversalTweaks.cfg index 04d3b81c..e82908ed 100644 --- a/overrides/config/UniversalTweaks.cfg +++ b/overrides/config/UniversalTweaks.cfg @@ -147,7 +147,7 @@ general { "model gap" { # Fixes transparent gaps in all 3D models of blocks and items - B:"[1] Model Gap Toggle"=false + B:"[1] Model Gap Toggle"=true # Quad X/Y offset # Moves the quad toward the center of the item @@ -192,7 +192,7 @@ general { # Enables debug logging B:"Debug Logging"=false - B:"Obsolete Mods Screen"=false + B:"Obsolete Mods Screen"=true # Prints the time the game needed to launch to the log B:"Show Loading Time"=true @@ -1311,7 +1311,7 @@ general { I:"Auto Save Interval"=900 # Improves model load times by checking if an animated model exists before trying to load it - B:"Check Animated Models"=false + B:"Check Animated Models"=true # Adds an IRecipe cache to improve recipe performance in larger modpacks B:"Crafting Cache"=true @@ -1320,7 +1320,7 @@ general { B:"Disable Audio Debug"=true # Improves rendering performance by removing the resource location text on missing models - B:"Disable Fancy Missing Model"=false + B:"Disable Fancy Missing Model"=true # Replaces color lookup for sheep to check a predefined table rather than querying the recipe registry B:"Fast Dye Blending"=true From ee84e847764b12d1f8ad4863e74bd2356f82ae55 Mon Sep 17 00:00:00 2001 From: tier940 Date: Fri, 22 Sep 2023 21:02:18 +0900 Subject: [PATCH 14/15] Fix server jvma --- serverfiles/ServerStart.bat | 2 +- serverfiles/TmuxServer.sh | 2 +- serverfiles/docker-compose.yml | 2 +- serverfiles/settings.bat | 2 +- serverfiles/settings.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/serverfiles/ServerStart.bat b/serverfiles/ServerStart.bat index 553ed749..144661fe 100644 --- a/serverfiles/ServerStart.bat +++ b/serverfiles/ServerStart.bat @@ -4,7 +4,7 @@ call settings.bat :start_server echo Starting GregTech Expert Server... -java -server -Xms%MIN_RAM% -Xmx%MAX_RAM% -XX:MaxMetaspaceSize=%MAX_MetaspaceSize% %JAVA_PARAMETERS% -jar %SERVER_JAR% -XX:OnOutOfMemoryError="kill -9 %p" nogui +java -server -Xms%MIN_RAM% -Xmx%MAX_RAM% -XX:MaxMetaspaceSize=%MAX_MetaspaceSize% %JAVA_PARAMETERS% -jar %SERVER_JAR% nogui pause exit /B diff --git a/serverfiles/TmuxServer.sh b/serverfiles/TmuxServer.sh index 11a7c3c3..1e130c6c 100644 --- a/serverfiles/TmuxServer.sh +++ b/serverfiles/TmuxServer.sh @@ -9,7 +9,7 @@ MC_HOME="/home/minecraft/gte2/" MC_JAR_FILE="forge-1.12.2-14.23.5.2860.jar" MC_MIN_RAM="4G" MC_MAX_RAM="8G" -MC_JVM_PARAMETERS="-XX:MetaspaceSize=256M -XX:MaxMetaspaceSize=256M -XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -XX:G1NewSizePercent=40 -XX:G1MaxNewSizePercent=50 -XX:G1HeapRegionSize=16M -XX:G1ReservePercent=15 -XX:InitiatingHeapOccupancyPercent=20 -Dlog4j.configurationFile=log4j2_112-116.xml" +MC_JVM_PARAMETERS="-XX:MaxMetaspaceSize=512M -XX:MaxRAMPercentage=95.0 -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Dterminal.jline=false -Dterminal.ansi=true -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+UseNUMA -XX:+CMSParallelRemarkEnabled -XX:MaxTenuringThreshold=15 -XX:MaxGCPauseMillis=30 -XX:GCPauseIntervalMillis=150 -XX:+UseAdaptiveGCBoundary -XX:-UseGCOverheadLimit -XX:+UseBiasedLocking -XX:SurvivorRatio=8 -XX:TargetSurvivorRatio=90 -XX:MaxTenuringThreshold=15 -Dfml.ignorePatchDiscrepancies=true -Dfml.ignoreInvalidMinecraftCertificates=true -XX:+UseFastAccessorMethods -XX:+UseCompressedOops -XX:+OptimizeStringConcat -XX:+AggressiveOpts -XX:ReservedCodeCacheSize=2048m -XX:+UseCodeCacheFlushing -XX:SoftRefLRUPolicyMSPerMB=10000 -XX:ParallelGCThreads=10 -Djava.net.preferIPv4Stack=true -Dlog4j.configurationFile=log4j2_112-116.xml" is_server_running() { /usr/bin/tmux -L ${TMUX_SOCKET} has-session -t ${TMUX_SESSION} > /dev/null 2>&1 diff --git a/serverfiles/docker-compose.yml b/serverfiles/docker-compose.yml index 4b7a66dd..1137a45d 100644 --- a/serverfiles/docker-compose.yml +++ b/serverfiles/docker-compose.yml @@ -8,7 +8,7 @@ services: ports: - 25565:25565 environment: - JVM_OPTS: -Dfml.queryResult=confirm -XX:+UseContainerSupport -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Dlog4j.configurationFile=log4j2_112-116.xml + JVM_OPTS: -XX:MaxMetaspaceSize=512M -Dfml.queryResult=confirm -XX:+UseContainerSupport -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j.configurationFile=log4j2_112-116.xml USE_AIKAR_FLAGS: true EULA: true TYPE: AUTO_CURSEFORGE diff --git a/serverfiles/settings.bat b/serverfiles/settings.bat index b7a7f087..e6f4bcd2 100644 --- a/serverfiles/settings.bat +++ b/serverfiles/settings.bat @@ -6,4 +6,4 @@ REM You can edit these values if you wish. set MIN_RAM=4096M set MAX_RAM=8192M set MAX_MetaspaceSize=512M -set JAVA_PARAMETERS=-XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+UseNUMA -XX:+CMSParallelRemarkEnabled -XX:MaxTenuringThreshold=15 -XX:MaxGCPauseMillis=30 -XX:GCPauseIntervalMillis=150 -XX:+UseAdaptiveGCBoundary -XX:-UseGCOverheadLimit -XX:+UseBiasedLocking -XX:SurvivorRatio=8 -XX:TargetSurvivorRatio=90 -XX:MaxTenuringThreshold=15 -Dfml.ignorePatchDiscrepancies=true -Dfml.ignoreInvalidMinecraftCertificates=true -XX:+UseFastAccessorMethods -XX:+UseCompressedOops -XX:+OptimizeStringConcat -XX:+AggressiveOpts -XX:ReservedCodeCacheSize=2048m -XX:+UseCodeCacheFlushing -XX:SoftRefLRUPolicyMSPerMB=10000 -XX:ParallelGCThreads=10 -Djava.net.preferIPv4Stack=true -Dlog4j.configurationFile=log4j2_112-116.xml +set JAVA_PARAMETERS=-XX:MaxRAMPercentage=95.0 -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Dterminal.jline=false -Dterminal.ansi=true -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+UseNUMA -XX:+CMSParallelRemarkEnabled -XX:MaxTenuringThreshold=15 -XX:MaxGCPauseMillis=30 -XX:GCPauseIntervalMillis=150 -XX:+UseAdaptiveGCBoundary -XX:-UseGCOverheadLimit -XX:+UseBiasedLocking -XX:SurvivorRatio=8 -XX:TargetSurvivorRatio=90 -XX:MaxTenuringThreshold=15 -Dfml.ignorePatchDiscrepancies=true -Dfml.ignoreInvalidMinecraftCertificates=true -XX:+UseFastAccessorMethods -XX:+UseCompressedOops -XX:+OptimizeStringConcat -XX:+AggressiveOpts -XX:ReservedCodeCacheSize=2048m -XX:+UseCodeCacheFlushing -XX:SoftRefLRUPolicyMSPerMB=10000 -XX:ParallelGCThreads=10 -Djava.net.preferIPv4Stack=true -Dlog4j.configurationFile=log4j2_112-116.xml diff --git a/serverfiles/settings.sh b/serverfiles/settings.sh index 1c6dc545..0c1427ab 100644 --- a/serverfiles/settings.sh +++ b/serverfiles/settings.sh @@ -6,4 +6,4 @@ export SERVER_JAR="forge-1.12.2-14.23.5.2860.jar" export MIN_RAM="4096M" export MAX_RAM="8192M" export Max_MetaspaceSize="512M" -export JAVA_PARAMETERS="-XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+UseNUMA -XX:+CMSParallelRemarkEnabled -XX:MaxTenuringThreshold=15 -XX:MaxGCPauseMillis=30 -XX:GCPauseIntervalMillis=150 -XX:+UseAdaptiveGCBoundary -XX:-UseGCOverheadLimit -XX:+UseBiasedLocking -XX:SurvivorRatio=8 -XX:TargetSurvivorRatio=90 -XX:MaxTenuringThreshold=15 -Dfml.ignorePatchDiscrepancies=true -Dfml.ignoreInvalidMinecraftCertificates=true -XX:+UseFastAccessorMethods -XX:+UseCompressedOops -XX:+OptimizeStringConcat -XX:+AggressiveOpts -XX:ReservedCodeCacheSize=2048m -XX:+UseCodeCacheFlushing -XX:SoftRefLRUPolicyMSPerMB=10000 -XX:ParallelGCThreads=10 -Djava.net.preferIPv4Stack=true -Dlog4j.configurationFile=log4j2_112-116.xml" +export JAVA_PARAMETERS="-XX:MaxRAMPercentage=95.0 -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Dterminal.jline=false -Dterminal.ansi=true -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+UseNUMA -XX:+CMSParallelRemarkEnabled -XX:MaxTenuringThreshold=15 -XX:MaxGCPauseMillis=30 -XX:GCPauseIntervalMillis=150 -XX:+UseAdaptiveGCBoundary -XX:-UseGCOverheadLimit -XX:+UseBiasedLocking -XX:SurvivorRatio=8 -XX:TargetSurvivorRatio=90 -XX:MaxTenuringThreshold=15 -Dfml.ignorePatchDiscrepancies=true -Dfml.ignoreInvalidMinecraftCertificates=true -XX:+UseFastAccessorMethods -XX:+UseCompressedOops -XX:+OptimizeStringConcat -XX:+AggressiveOpts -XX:ReservedCodeCacheSize=2048m -XX:+UseCodeCacheFlushing -XX:SoftRefLRUPolicyMSPerMB=10000 -XX:ParallelGCThreads=10 -Djava.net.preferIPv4Stack=true -Dlog4j.configurationFile=log4j2_112-116.xml" From d9143612c4fef39eb0df313a5661f8a3f7f86cb1 Mon Sep 17 00:00:00 2001 From: tier940 Date: Fri, 22 Sep 2023 21:27:34 +0900 Subject: [PATCH 15/15] Added description of plugin server --- overrides/config/ftbutilities.cfg | 2 +- serverfiles/PleaseRead.txt | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/overrides/config/ftbutilities.cfg b/overrides/config/ftbutilities.cfg index 2b436bb3..935e1b01 100644 --- a/overrides/config/ftbutilities.cfg +++ b/overrides/config/ftbutilities.cfg @@ -105,7 +105,7 @@ ranks { B:enabled=true # Adds chat colors/rank-specific syntax. - B:override_chat=true + B:override_chat=false # Allow to configure commands with ranks. Disable this if you want to use other permission mod for that. B:override_commands=true diff --git a/serverfiles/PleaseRead.txt b/serverfiles/PleaseRead.txt index e2055e58..d8dd1d5b 100644 --- a/serverfiles/PleaseRead.txt +++ b/serverfiles/PleaseRead.txt @@ -1,5 +1,11 @@ -1. Please Forge download for forge-1.12.2-14.23.5.2860-installer.jar -2. Edit settings.bat or settings.sh -3. Start Install.bat or Install.sh -4. ServerStart.bat or ServerStart.sh push -5. Enjoy +## Start forge server? +1. Please Forge download for forge-1.12.2-14.23.5.2860-installer.jar +2. Edit settings.bat or settings.sh +3. Start Install.bat or Install.sh +4. ServerStart.bat or ServerStart.sh push +5. Enjoy + +## Start plugin server? +1. Download [CatServer](https://catmc.org/) +2. Open ftbutilities.cfg and change `B:override_commands=true` to `B:coverride_commands=false` +3. Start server