Skip to content

Commit 1a93889

Browse files
UltraPuPowertrulynon1xx1
authored
Various fixes from the backlog (#598)
* - add parallels to IAV - fix old casket in quest - fix prettier newline errors - fix shellite wire quest using converter template - chorus fruit compressor recipe conflict - fix RGM recipe conflict with strontium boosting - fix HAM and SPHC missing blocks in structure - fix gate multiblocks quest having a wrong dependency - fix mechanical sieve using tag instead of item - fix carbonic acid producing 3x potassium given - trim fat from processing lines - power chapter changes * fix network hub double tooltip * remove nuclear deprecation tooltip * fix kubes taking in dynamo hatches * fix CGS not allowing output hatches * readd new age config * create new age config * don't use alias * don't use aliases * nerf create steam engines by 25% * fix typo * Fix menu buttons and add FM editing tools * fix renaming issue * gcrop machine recipes and recipe type integration * fix recipes :/ * fix quest missing item, gas collector crash and toolkit missing removal * add better extended recipe builder types * fix compound generator preview * Update deionized_water.js * solar cell repair (disabled for now) * feedback * add minimum energy hatches for electric ore factory * Content: - Multiblock structure helper - Recipes for VM and GCROP - Fix assets issues for draconic neutron reflector - Recipe type stability for EGS - GCrops quest tree file (not in-game, very WIP) Co-authored-by: n1xx1 <n1xx1@users.noreply.github.com>, thanks for the help with typescript definitions * Content: - Final typescript fixes for multiblock tool - Recipe for stainless firebox - Steel buzzsaw in questbook * Thermal augments use build in modifiers instead of NBT * workable solar cell repair recipe * ts and eslint fixes * revert create engine nerf * A lot of fixes KubeJS - Large Kubes don't have fluid outputs - Molten destabiliser doesn't have fluid inputs - Add zalloy ABS recipe - Typos Quests: - Inaccurate dependencies for plasma turbine, wireless hub and EOF - Typos Configs: - Removed mentions of MA and addons - Blacklisted Sky Steel Block - Update configs for the following: - Craftpresence - Create new age - Create low heated - Fork - Core - Skyblockbuilder - Default world type * fix material issues at load up * undo added zalloy recipe * agh * fix warnings * hypertube recipes * fix formatting * remove redundant gitignore line add gcrops quest chapter * Add better dimensional stages implementation (#612) Revamp dimensional stages and coordinate crystals to look more visually appealing and remove 3 dependant mods * solar repair pt 1 * solar repair pt 2 * Circuit etching and lint fix * quest fixes * laserio gregification * modular routers gregification + fixes * test utility changes * programmatic item hiding for emi * add to eslint config * config updates * Remove electronicComponents from component_materials_type (redundant) * Revert "Remove electronicComponents from component_materials_type (redundant)" This reverts commit 0d10b21. * types: fixes * laserio fixes * fix some item hiding * add item hiding config back (removed vintage from config, less clutter) * blacklist cleaning * remove useless code and console warnings * fix menu helper, delete unnecessary gcrop chapter backup, change recipe helper zip function * simplify zip function * final mod and config updates * remove ae2 * fix laser io recipe issues * fix hypertubes recipes (pls test in game) + recipe dump utility * prioritize showing the dynamo hatches in the compound gen * fix pressing clay into brick requiring a block of clay * make network hub form in preview * fix laser IO recipes and update JEI configs --------- Co-authored-by: trulyno <78795220+trulyno@users.noreply.github.com> Co-authored-by: n1xx1 <me@simonemiraglia.it>
1 parent 894fd9c commit 1a93889

159 files changed

Lines changed: 16053 additions & 12421 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
!scripts/
1010
!compile_data/
1111
!.github/
12+
!tools/
1213

1314
# Add files in main directory
1415
!.gitattributes
@@ -17,15 +18,13 @@
1718
!panorama.dat
1819
!README.md
1920

20-
# Specific exclusion - config folder
21-
config/*
2221
# Keep directories
2322
!config/ae2/
2423
!config/almostunified/
2524
!config/crash_asistant/
2625
!config/defaultworldtype/
27-
!config/fancymenu/
28-
!config/ftbquests/
26+
!config/fancymenu/**
27+
!config/ftbquests/**
2928
!config/gamestages/
3029
!config/jade/
3130
!config/jei/
@@ -37,6 +36,7 @@ config/*
3736
!config/chloride-client.json
3837
!config/colossalchests-common.toml
3938
!config/craftpresence.json
39+
!config/create_new_age-common.toml
4040
!config/createlowheated-common.toml
4141
!config/emi.css
4242
!config/exnihilosequentia-common.toml

compile_data/manifest.json

Lines changed: 33 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
},
138138
{
139139
"projectID": 398521,
140-
"fileID": 8083474,
140+
"fileID": 8672742,
141141
"required": true,
142142
"isLocked": false
143143
},
@@ -159,12 +159,6 @@
159159
"required": true,
160160
"isLocked": false
161161
},
162-
{
163-
"projectID": 223794,
164-
"fileID": 7148487,
165-
"required": true,
166-
"isLocked": false
167-
},
168162
{
169163
"projectID": 656346,
170164
"fileID": 4892299,
@@ -239,7 +233,7 @@
239233
},
240234
{
241235
"projectID": 968398,
242-
"fileID": 7634682,
236+
"fileID": 8692227,
243237
"required": true,
244238
"isLocked": false
245239
},
@@ -293,7 +287,13 @@
293287
},
294288
{
295289
"projectID": 238222,
296-
"fileID": 8526990,
290+
"fileID": 8677648,
291+
"required": true,
292+
"isLocked": false
293+
},
294+
{
295+
"projectID": 1624366,
296+
"fileID": 8516890,
297297
"required": true,
298298
"isLocked": false
299299
},
@@ -345,12 +345,6 @@
345345
"required": true,
346346
"isLocked": false
347347
},
348-
{
349-
"projectID": 972469,
350-
"fileID": 5091980,
351-
"required": true,
352-
"isLocked": false
353-
},
354348
{
355349
"projectID": 287342,
356350
"fileID": 8426836,
@@ -551,7 +545,7 @@
551545
},
552546
{
553547
"projectID": 394535,
554-
"fileID": 4712179,
548+
"fileID": 8646502,
555549
"required": true,
556550
"isLocked": false
557551
},
@@ -645,12 +639,6 @@
645639
"required": true,
646640
"isLocked": false
647641
},
648-
{
649-
"projectID": 1553142,
650-
"fileID": 8539719,
651-
"required": true,
652-
"isLocked": false
653-
},
654642
{
655643
"projectID": 544096,
656644
"fileID": 4688989,
@@ -659,7 +647,7 @@
659647
},
660648
{
661649
"projectID": 454372,
662-
"fileID": 8526509,
650+
"fileID": 8677304,
663651
"required": true,
664652
"isLocked": false
665653
},
@@ -719,7 +707,7 @@
719707
},
720708
{
721709
"projectID": 1154099,
722-
"fileID": 8049661,
710+
"fileID": 8636649,
723711
"required": true,
724712
"isLocked": false
725713
},
@@ -771,6 +759,12 @@
771759
"required": true,
772760
"isLocked": false
773761
},
762+
{
763+
"projectID": 1553142,
764+
"fileID": 8595790,
765+
"required": true,
766+
"isLocked": false
767+
},
774768
{
775769
"projectID": 240633,
776770
"fileID": 7188685,
@@ -789,12 +783,6 @@
789783
"required": true,
790784
"isLocked": false
791785
},
792-
{
793-
"projectID": 239197,
794-
"fileID": 7772873,
795-
"required": true,
796-
"isLocked": false
797-
},
798786
{
799787
"projectID": 938643,
800788
"fileID": 5109692,
@@ -958,14 +946,14 @@
958946
"isLocked": false
959947
},
960948
{
961-
"projectID": 938916,
962-
"fileID": 6363006,
949+
"projectID": 228525,
950+
"fileID": 7612389,
963951
"required": true,
964952
"isLocked": false
965953
},
966954
{
967-
"projectID": 228525,
968-
"fileID": 7612389,
955+
"projectID": 938916,
956+
"fileID": 6363006,
969957
"required": true,
970958
"isLocked": false
971959
},
@@ -989,13 +977,13 @@
989977
},
990978
{
991979
"projectID": 790626,
992-
"fileID": 8459635,
980+
"fileID": 8664181,
993981
"required": true,
994982
"isLocked": false
995983
},
996984
{
997985
"projectID": 326652,
998-
"fileID": 8382158,
986+
"fileID": 8617695,
999987
"required": true,
1000988
"isLocked": false
1001989
},
@@ -1035,12 +1023,6 @@
10351023
"required": true,
10361024
"isLocked": false
10371025
},
1038-
{
1039-
"projectID": 268655,
1040-
"fileID": 5790361,
1041-
"required": true,
1042-
"isLocked": false
1043-
},
10441026
{
10451027
"projectID": 585328,
10461028
"fileID": 7930776,
@@ -1054,14 +1036,14 @@
10541036
"isLocked": false
10551037
},
10561038
{
1057-
"projectID": 271009,
1058-
"fileID": 7214476,
1039+
"projectID": 622737,
1040+
"fileID": 4834403,
10591041
"required": true,
10601042
"isLocked": false
10611043
},
10621044
{
1063-
"projectID": 622737,
1064-
"fileID": 4834403,
1045+
"projectID": 271009,
1046+
"fileID": 7214476,
10651047
"required": true,
10661048
"isLocked": false
10671049
},
@@ -1074,18 +1056,18 @@
10741056
{
10751057
"projectID": 688231,
10761058
"fileID": 7758640,
1077-
"required": true,
1059+
"required": false,
10781060
"isLocked": false
10791061
},
10801062
{
1081-
"projectID": 309927,
1082-
"fileID": 6418456,
1063+
"projectID": 892005,
1064+
"fileID": 8615273,
10831065
"required": true,
10841066
"isLocked": false
10851067
},
10861068
{
1087-
"projectID": 892005,
1088-
"fileID": 8457933,
1069+
"projectID": 309927,
1070+
"fileID": 6418456,
10891071
"required": true,
10901072
"isLocked": false
10911073
},

compile_data/modlist.html

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<li><a href="https://www.curseforge.com/minecraft/mc-mods/rechiseled">Rechiseled (by SuperMartijn642)</a></li>
2424
<li><a href="https://www.curseforge.com/minecraft/mc-mods/recipes-library">Recipes Library (by GeheimagentNr1)</a></li>
2525
<li><a href="https://www.curseforge.com/minecraft/mc-mods/almostunified">Almost Unified (by AlmostReliable)</a></li>
26-
<li><a href="https://www.curseforge.com/minecraft/mc-mods/applied-energistics-2">Applied Energistics 2 (by thetechnici4n)</a></li>
2726
<li><a href="https://www.curseforge.com/minecraft/mc-mods/lmft">Load My F***ing Tags (by Blodhgarm)</a></li>
2827
<li><a href="https://www.curseforge.com/minecraft/mc-mods/fancymenu">FancyMenu (by Keksuccino)</a></li>
2928
<li><a href="https://www.curseforge.com/minecraft/mc-mods/fastsuite">FastSuite (by Shadows_of_Fire)</a></li>
@@ -46,6 +45,7 @@
4645
<li><a href="https://www.curseforge.com/minecraft/mc-mods/better-fps-render-distance">Better Fps - Render Distance (by someaddon)</a></li>
4746
<li><a href="https://www.curseforge.com/minecraft/mc-mods/placebo">Placebo (by Shadows_of_Fire)</a></li>
4847
<li><a href="https://www.curseforge.com/minecraft/mc-mods/jei">Just Enough Items (JEI) (by mezz)</a></li>
48+
<li><a href="https://www.curseforge.com/minecraft/mc-mods/ae2-uelm">AE2 Unofficial Extended Life Modern (by Kolja)</a></li>
4949
<li><a href="https://www.curseforge.com/minecraft/mc-mods/functional-storage">Functional Storage (by Buuz135)</a></li>
5050
<li><a href="https://www.curseforge.com/minecraft/mc-mods/sky-guis">Sky GUIs (by MelanX)</a></li>
5151
<li><a href="https://www.curseforge.com/minecraft/mc-mods/ae2-network-analyser">AE2 Network Analyser (by GlodBlock)</a></li>
@@ -54,7 +54,6 @@
5454
<li><a href="https://www.curseforge.com/minecraft/mc-mods/create-low-heated">Create Low-Heated (by zeh_maria)</a></li>
5555
<li><a href="https://www.curseforge.com/minecraft/mc-mods/star-technology-core">Star Technology - Core (by trulyno)</a></li>
5656
<li><a href="https://www.curseforge.com/minecraft/mc-mods/item-collectors">Item Collectors (by SuperMartijn642)</a></li>
57-
<li><a href="https://www.curseforge.com/minecraft/mc-mods/re-dimension-stages">Re-Dimension Stages (by CPearl)</a></li>
5857
<li><a href="https://www.curseforge.com/minecraft/mc-mods/titanium">Titanium (by Buuz135)</a></li>
5958
<li><a href="https://www.curseforge.com/minecraft/mc-mods/project-red-integration">Project Red - Integration (by MrTJP)</a></li>
6059
<li><a href="https://www.curseforge.com/minecraft/mc-mods/fastworkbench">FastWorkbench (by Shadows_of_Fire)</a></li>
@@ -124,10 +123,10 @@
124123
<li><a href="https://www.curseforge.com/minecraft/mc-mods/kubejs-thermal">KubeJS Thermal (by Lat)</a></li>
125124
<li><a href="https://www.curseforge.com/minecraft/mc-mods/libx">LibX (by noeppi_noeppi)</a></li>
126125
<li><a href="https://www.curseforge.com/minecraft/mc-mods/laserio-uel">LaserIO Unofficial Extended Life (by rischiopoco)</a></li>
126+
<li><a href="https://www.curseforge.com/minecraft/mc-mods/rts-building-build-from-above">RTS building: Build From Above (by Hcrab455682109)</a></li>
127127
<li><a href="https://www.curseforge.com/minecraft/mc-mods/inventory-sorter">Inventory Sorter (by cpw)</a></li>
128128
<li><a href="https://www.curseforge.com/minecraft/mc-mods/thermal-foundation">Thermal Foundation (by TeamCoFH)</a></li>
129129
<li><a href="https://www.curseforge.com/minecraft/mc-mods/no-telemetry">No Telemetry (by kb1000)</a></li>
130-
<li><a href="https://www.curseforge.com/minecraft/mc-mods/crafttweaker">CraftTweaker (by Jaredlll08)</a></li>
131130
<li><a href="https://www.curseforge.com/minecraft/mc-mods/melody">Melody (by Keksuccino)</a></li>
132131
<li><a href="https://www.curseforge.com/minecraft/mc-mods/modular-routers">Modular Routers (by desht_08)</a></li>
133132
<li><a href="https://www.curseforge.com/minecraft/mc-mods/chipped">Chipped (by terrariumearth)</a></li>
@@ -155,8 +154,8 @@
155154
<li><a href="https://www.curseforge.com/minecraft/mc-mods/resourceful-lib">Resourceful Lib (by ThatGravyBoat)</a></li>
156155
<li><a href="https://www.curseforge.com/minecraft/mc-mods/unilib">UniLib (by CDAGaming_)</a></li>
157156
<li><a href="https://www.curseforge.com/minecraft/mc-mods/cyclops-core">Cyclops Core (by kroeser)</a></li>
158-
<li><a href="https://www.curseforge.com/minecraft/mc-mods/chipped-express">Chipped Express (by DevDyna)</a></li>
159157
<li><a href="https://www.curseforge.com/minecraft/mc-mods/bookshelf">Bookshelf (by DarkhaxDev)</a></li>
158+
<li><a href="https://www.curseforge.com/minecraft/mc-mods/chipped-express">Chipped Express (by DevDyna)</a></li>
160159
<li><a href="https://www.curseforge.com/minecraft/mc-mods/crafting-tweaks">Crafting Tweaks (by BlayTheNinth)</a></li>
161160
<li><a href="https://www.curseforge.com/minecraft/mc-mods/create-diesel-generators">Create: Diesel Generators (by George_VI)</a></li>
162161
<li><a href="https://www.curseforge.com/minecraft/mc-mods/controlling">Controlling (by Jaredlll08)</a></li>
@@ -168,15 +167,14 @@
168167
<li><a href="https://www.curseforge.com/minecraft/mc-mods/patchouli">Patchouli (by Vazkii)</a></li>
169168
<li><a href="https://www.curseforge.com/minecraft/mc-mods/easy-anvils">Easy Anvils (by Fuzs)</a></li>
170169
<li><a href="https://www.curseforge.com/minecraft/mc-mods/ferritecore">FerriteCore ((Neo)Forge) (by malte0811)</a></li>
171-
<li><a href="https://www.curseforge.com/minecraft/mc-mods/game-stages">Game Stages (by DarkhaxDev)</a></li>
172170
<li><a href="https://www.curseforge.com/minecraft/mc-mods/wooden-bucket">Wooden Bucket (by thecech12)</a></li>
173171
<li><a href="https://www.curseforge.com/minecraft/mc-mods/programmed-circuit-card">Programmed Circuit Card (by yuuki1293)</a></li>
174-
<li><a href="https://www.curseforge.com/minecraft/mc-mods/forgiving-void">Forgiving Void (by BlayTheNinth)</a></li>
175172
<li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-backups-2">FTB Backups 2 (by FTB)</a></li>
173+
<li><a href="https://www.curseforge.com/minecraft/mc-mods/forgiving-void">Forgiving Void (by BlayTheNinth)</a></li>
176174
<li><a href="https://www.curseforge.com/minecraft/mc-mods/dustrial-decor">'Dustrial Decor (by BlueDuck)</a></li>
177175
<li><a href="https://www.curseforge.com/minecraft/mc-mods/create-steam-n-rails">Create: Steam 'n' Rails (by IThundxr)</a></li>
178-
<li><a href="https://www.curseforge.com/minecraft/mc-mods/curios">Curios API (by TheIllusiveC4)</a></li>
179176
<li><a href="https://www.curseforge.com/minecraft/mc-mods/ex-pattern-provider">ExtendedAE (by GlodBlock)</a></li>
177+
<li><a href="https://www.curseforge.com/minecraft/mc-mods/curios">Curios API (by TheIllusiveC4)</a></li>
180178
<li><a href="https://www.curseforge.com/minecraft/mc-mods/travel-anchors">Travel Anchors (by CastCrafter)</a></li>
181179
<li><a href="https://www.curseforge.com/minecraft/mc-mods/novacore">NovaCore (by NovaMachina)</a></li>
182180
<li><a href="https://www.curseforge.com/minecraft/mc-mods/entityculling">Entity Culling Fabric/Forge (by tr7zw)</a></li>

config/ae2/client.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
"clearGridOnClose_comment": "Automatically clear the crafting/encoding grid when closing the terminal",
2222
"clearGridOnClose": false,
2323
"terminalMargin_comment": "The vertical margin to apply when sizing terminals. Used to make room for centered item mod search bars",
24-
"terminalMargin": 25
24+
"terminalMargin": 25,
25+
"maxPinnedRows_comment": "The maximum number of pinned rows to display, crafting and manual.",
26+
"maxPinnedRows": 3
2527
},
2628
"terminals": {
2729
"terminalStyle": "small",

config/ae2/common.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
},
7171
"PowerRatios": {
7272
"ForgeEnergy": 0.5,
73+
"EnergyUnit": 2.0,
7374
"UsageMultiplier": 1.0,
7475
"GridEnergyStoragePerNode_comment": "How much energy can the internal grid buffer storage per node attached to the grid.",
7576
"GridEnergyStoragePerNode": 25.0,

0 commit comments

Comments
 (0)