Merge pull request #92 from ThePansmith/CABIN_1.3.0

Cabin 1.3.0
ThePansmith · Jun 11, 2024 · 8c65619 · 8c65619
2 parents 1eb3317 + a39cf9f
commit 8c65619
Show file tree

Hide file tree

Showing 99 changed files with 4,302 additions and 2,376 deletions.
diff --git a/manifest.json b/manifest.json
@@ -12,7 +12,7 @@
          "required":true
       },
       {
-         "fileID":4498424,
+         "fileID":4957984,
          "projectID":433862,
          "required":true
       },
@@ -57,7 +57,7 @@
          "required":true
       },
       {
-         "fileID":4531967,
+         "fileID":5216875,
          "projectID":267193,
          "required":true
       },
@@ -117,8 +117,8 @@
          "required":true
       },
       {
-         "fileID":4445746,
-         "projectID":240630,
+         "fileID":3929204,
+         "projectID":325625,
          "required":true
       },
       {
@@ -132,7 +132,7 @@
          "required":true
       },
       {
-         "fileID":4509007,
+         "fileID":5134546,
          "projectID":74924,
          "required":true
       },
@@ -182,12 +182,12 @@
          "required":true
       },
       {
-         "fileID":4732252,
+         "fileID":4837418,
          "projectID":521393,
          "required":true
       },
       {
-         "fileID":4774383,
+         "fileID":5301367,
          "projectID":310111,
          "required":true
       },
@@ -217,7 +217,7 @@
          "required":true
       },
       {
-         "fileID":4509008,
+         "fileID":5148042,
          "projectID":74072,
          "required":true
       },
@@ -302,7 +302,7 @@
          "required":true
       },
       {
-         "fileID":4521465,
+         "fileID":5137931,
          "projectID":419699,
          "required":true
       },
@@ -327,7 +327,7 @@
          "required":true
       },
       {
-         "fileID":4633387,
+         "fileID":4973439,
          "projectID":348521,
          "required":true
       },
@@ -337,7 +337,7 @@
          "required":true
       },
       {
-         "fileID":4759875,
+         "fileID":4801048,
          "projectID":69162,
          "required":true
       },
@@ -387,12 +387,12 @@
          "required":true
       },
       {
-         "fileID":4590652,
+         "fileID":4985315,
          "projectID":309927,
          "required":true
       },
       {
-         "fileID":4800666,
+         "fileID":5322305,
          "projectID":908741,
          "required":true
       },
@@ -457,7 +457,7 @@
          "required":true
       },
       {
-         "fileID":4771446,
+         "fileID":5129277,
          "projectID":854949,
          "required":true
       },
@@ -482,7 +482,7 @@
          "required":true
       },
       {
-         "fileID":4585765,
+         "fileID":4842875,
          "projectID":429371,
          "required":true
       },
@@ -492,7 +492,7 @@
          "required":true
       },
       {
-         "fileID":4216196,
+         "fileID":4843021,
          "projectID":421694,
          "required":true
       },
@@ -522,7 +522,7 @@
          "required":true
       },
       {
-         "fileID":4767129,
+         "fileID":5399365,
          "projectID":790626,
          "required":true
       },
@@ -552,12 +552,12 @@
          "required":true
       },
       {
-         "fileID":4783586,
+         "fileID":5286275,
          "projectID":558998,
          "required":true
       },
       {
-         "fileID":4789545,
+         "fileID":5093207,
          "projectID":888624,
          "required":true
       },
@@ -592,12 +592,12 @@
          "required":true
       },
       {
-         "fileID":4736645,
+         "fileID":5194758,
          "projectID":422301,
          "required":true
       },
       {
-         "fileID":4736642,
+         "fileID":5296312,
          "projectID":618298,
          "required":true
       },
@@ -617,7 +617,7 @@
          "required":true
       },
       {
-         "fileID":4788136,
+         "fileID":5102251,
          "projectID":454372,
          "required":true
       },
@@ -627,7 +627,7 @@
          "required":true
       },
       {
-         "fileID":4800837,
+         "fileID":5079263,
          "projectID":324717,
          "required":true
       },
@@ -687,7 +687,7 @@
          "required":true
       },
       {
-         "fileID":3694403,
+         "fileID":3713957,
          "projectID":238551,
          "required":true
       },
@@ -707,7 +707,7 @@
          "required":true
       },
       {
-         "fileID":4808763,
+         "fileID":5268448,
          "projectID":628539,
          "required":true
       },
@@ -717,7 +717,7 @@
          "required":true
       },
       {
-         "fileID":4513973,
+         "fileID":4939214,
          "projectID":233071,
          "required":true
       },
@@ -777,7 +777,7 @@
          "required":true
       },
       {
-         "fileID":4838717,
+         "fileID":4970407,
          "projectID":820977,
          "required":true
       },
@@ -790,20 +790,30 @@
          "fileID":4318732,
          "projectID":666198,
          "required":true
+      },
+      {
+         "fileID":3712896,
+         "projectID":523013,
+         "required":true
+      },
+      {
+         "fileID":3694844,
+         "projectID":558746,
+         "required":true
       }
    ],
    "manifestType":"minecraftModpack",
    "manifestVersion":1,
    "minecraft":{
       "modLoaders":[
          {
-            "id":"forge-40.2.8",
+            "id":"forge-40.2.21",
             "primary":true
          }
       ],
       "version":"1.18.2"
    },
    "name":"CABIN",
    "overrides":"overrides",
-   "version":"1.2.3"
+   "version":"1.3.0"
 }
diff --git a/modlist.html b/modlist.html
@@ -19,11 +19,11 @@
 <li><a href="https://www.curseforge.com/projects/324973">Dungeon Crawl (by xiroc)</a></li>
 <li><a href="https://www.curseforge.com/projects/245174">Ender Storage 1.8.+ (by ChickenBones, covers1624)</a></li>
 <li><a href="https://www.curseforge.com/projects/270183">Exchangers (by Jackyy, TurkeyDev)</a></li>
+<li><a href="https://www.curseforge.com/projects/558746">Expanded Caves (by Rover656)</a></li>
 <li><a href="https://www.curseforge.com/projects/491794">Explorer's Compass (by ChaosTheDude)</a></li>
 <li><a href="https://www.curseforge.com/projects/398521">Farmer's Delight (by vectorwing)</a></li>
 <li><a href="https://www.curseforge.com/projects/356646">GunpowderLib (by Jackyy)</a></li>
 <li><a href="https://www.curseforge.com/projects/520110">Iceberg [Forge] (by Grend)</a></li>
-<li><a href="https://www.curseforge.com/projects/240630">Just Enough Resources (JER)</a></li>
 <li><a href="https://www.curseforge.com/projects/686435">Leaves Be Gone [Forge &amp; Fabric] (by Fuzs)</a></li>
 <li><a href="https://www.curseforge.com/projects/532127">Legendary Tooltips [Forge] (by Grend)</a></li>
 <li><a href="https://www.curseforge.com/projects/74924">Mantle (by Slime Knights)</a></li>
@@ -36,8 +36,10 @@
 <li><a href="https://www.curseforge.com/projects/229045">Project Red - Integration (by MrTJP, Chicken Bones, covers1624)</a></li>
 <li><a href="https://www.curseforge.com/projects/478939">Project Red - Transmission (by MrTJP, Chicken Bones, covers1624)</a></li>
 <li><a href="https://www.curseforge.com/projects/495476">Puzzles Lib [Forge &amp; Fabric] (by Fuzs)</a></li>
+<li><a href="https://www.curseforge.com/projects/523013">Randomium Ore (by MehVahdJukaar)</a></li>
 <li><a href="https://www.curseforge.com/projects/521393">REI Plugin Compatibilities (REIPC) (by shedaniel)</a></li>
 <li><a href="https://www.curseforge.com/projects/310111">Roughly Enough Items Fabric/Forge (REI) (by shedaniel)</a></li>
+<li><a href="https://www.curseforge.com/projects/325625">Roughly Enough Resources (RER) (By theorbagain)</a></li>
 <li><a href="https://www.curseforge.com/projects/522039">Rubber Duck (by Salvadormg15)</a></li>
 <li><a href="https://www.curseforge.com/projects/661293">SmartBrainLib (Forge/Fabric/Quilt) (by Tslat)</a></li>
 <li><a href="https://www.curseforge.com/projects/688231">Create: Steam 'n' Rails (by The Railways Team)</a></li>

diff --git a/overrides/config/custom-micromaterials.cfg b/overrides/config/custom-micromaterials.cfg
@@ -793,6 +793,18 @@ everycomp:q/forbidden_arcanus/vertical_cherrywood_planks
 everycomp:q/forbidden_arcanus/vertical_mysterywood_planks
 everycomp:q/forbidden_arcanus/vertical_edelwood_planks
 
+# Expanded Caves
+#expcaves:broken_stone
+#expcaves:broken_deepslate
+expcaves:sediment_stone
+expcaves:lavastone
+expcaves:dirtstone
+#expcaves:dirtstone_cobble #normally I enable as many blocks as I can. But this is just brown endstone
+expcaves:marlstone
+expcaves:marlstone_powder
+expcaves:bricks_ice
+expcaves:bricks_snow
+
 # Farmer's Delight
 farmersdelight:carrot_crate
 farmersdelight:potato_crate
@@ -909,7 +921,7 @@ quark:yellow_blossom_leaves
 quark:red_blossom_leaves
 quark:midori_block
 quark:midori_pillar
-quark:dirty_glass
+#quark:dirty_glass
 quark:azalea_log
 quark:azalea_wood
 quark:azalea_planks
@@ -940,18 +952,18 @@ quark:dripstone_pillar
 quark:tuff_bricks
 quark:chiseled_tuff_bricks
 quark:tuff_pillar
-#quark:limestone_bricks
-#quark:chiseled_limestone_bricks
-#quark:limestone_pillar
-#quark:jasper_bricks
-#quark:chiseled_jasper_bricks
-#quark:jasper_pillar
-#quark:shale_bricks
-#quark:chiseled_shale_bricks
-#quark:shale_pillar
-#quark:myalite_bricks
-#quark:chiseled_myalite_bricks
-#quark:myalite_pillar
+quark:limestone_bricks
+quark:chiseled_limestone_bricks
+quark:limestone_pillar
+quark:jasper_bricks
+quark:chiseled_jasper_bricks
+quark:jasper_pillar
+quark:shale_bricks
+quark:chiseled_shale_bricks
+quark:shale_pillar
+quark:myalite_bricks
+quark:chiseled_myalite_bricks
+quark:myalite_pillar
 #quark:gravisand
 quark:duskbound_block
 quark:duskbound_lantern
@@ -1010,14 +1022,14 @@ quark:glowberry_sack
 quark:blaze_lantern
 quark:bonded_leather
 quark:bonded_rabbit_hide
-#quark:limestone
-#quark:polished_limestone
-#quark:jasper
-#quark:polished_jasper
-#quark:shale
-#quark:polished_shale
-#quark:myalite
-#quark:polished_myalite
+quark:limestone
+quark:polished_limestone
+quark:jasper
+quark:polished_jasper
+quark:shale
+quark:polished_shale
+quark:myalite
+quark:polished_myalite
 #quark:red_corundum
 #quark:waxed_red_corundum
 ##quark:red_corundum_cluster
@@ -1085,7 +1097,10 @@ quark:green_shingles
 quark:red_shingles
 quark:black_shingles
 
-
+# Randomium
+randomium:randomium_ore
+randomium:randomium_ore_deepslate
+randomium:randomium_ore_end
 
 # Rechiseled
 rechiseled:amethyst_block_beams