2.1.0-beta.4

Fabulously-Optimized · Aug 25, 2021 · 35a0dfa · 35a0dfa
1 parent 7446ffc
commit 35a0dfa
Show file tree

Hide file tree

Showing 26 changed files with 237 additions and 103 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,9 +8,22 @@ Notes for all 1.17.1 releases:
 * Curseforge Launcher: if you're upgrading from MC 1.16.x, please ☑️ Update to new Profile
 * MultiMC: Minecraft 1.17.1 requires Java 16: https://www.oracle.com/java/technologies/javase-jdk16-downloads.html
 
+### 2.1.0-beta.4
+
+Added
+* LambdaBetterGrass (Optifine's "better grass"!)
+* CustomEntityModels and CompleteConfig (Optifine's custom entity models, in alpha though)
+* Colormatic (water/biome colors, FO 1.9.1 parity)
+* FastChest and Better Beds (were removed in the previous beta)
+
+Removed
+* Enhanced Block Entities (postponing the addition due to mod compatibility bugs)
+
+Updated mods: FerriteCore, Mod Menu, Fabric API, Architectury API
+
 ### 2.1.0-beta.3
 
-It's time to test Indium! Please let me know how it goes: https://strawpoll.com/d169oq4g9
+It's time to test Indium! Please let me know how it goes: [the poll has ended]
 
 Changes from beta 2
 * Added Indium (rendering API, allows for more parity mods in the future)

diff --git a/CLI tools/Update Packwiz.py b/CLI tools/Update Packwiz.py
@@ -3,14 +3,20 @@
 user_path = os.path.expanduser("~")
 git_path = user_path + "/Documents/GitHub/fabulously-optimized/"
 exe_path = "packwiz.exe"
+packwiz_path = git_path + "Packwiz"
+mods_path = packwiz_path + "/mods"
 
-os.chdir(git_path + "Packwiz")
-from_file = input("Please drag the Curseforge zip file here: ")[2:] # Because dragging the file adds "& " for some reason
+mod_files = os.listdir(mods_path)
+for item in mod_files:
+    os.remove( os.path.join(mods_path, item))
+
+os.chdir(packwiz_path)
+from_file = input("Please drag the Curseforge zip file here: ")[3:][:-1] # Because dragging the file adds "& " and double quotes
 os.system(exe_path + " curseforge import " + from_file) # TODO: something's wrong here, packwiz claims there are two arguments
 os.system(exe_path + " remove hydrogen")
 os.system(exe_path + " mr install hydrogen")
 os.system(exe_path + " remove indium")
 os.system(exe_path + " mr install indium")
-os.system(exe_path +" refresh")
+os.system(exe_path + " refresh")
 
 # TODO: Update Modrinth json
diff --git a/Curseforge/manifest.json b/Curseforge/manifest.json
@@ -11,7 +11,7 @@
   "manifestType": "minecraftModpack",
   "manifestVersion": 1,
   "name": "Fabulously Optimized",
-  "version": "2.1.0-beta.2",
+  "version": "2.1.0-beta.4",
   "author": "robotkoer",
   "files": [
     {
@@ -21,22 +21,27 @@
     },
     {
       "projectID": 319057,
-      "fileID": 3329246,
+      "fileID": 3413206,
       "required": true
     },
     {
       "projectID": 448233,
       "fileID": 3388827,
       "required": true
     },
+    {
+      "projectID": 325092,
+      "fileID": 3436738,
+      "required": true
+    },
     {
       "projectID": 399798,
       "fileID": 3344195,
       "required": true
     },
     {
       "projectID": 419697,
-      "fileID": 3385669,
+      "fileID": 3436837,
       "required": true
     },
     {
@@ -56,27 +61,32 @@
     },
     {
       "projectID": 393442,
-      "fileID": 3348967,
+      "fileID": 3409038,
       "required": true
     },
     {
       "projectID": 306612,
-      "fileID": 3398557,
+      "fileID": 3438063,
       "required": true
     },
     {
       "projectID": 415758,
       "fileID": 3248104,
       "required": true
     },
+    {
+      "projectID": 335493,
+      "fileID": 3419561,
+      "required": true
+    },
     {
       "projectID": 349630,
       "fileID": 3379128,
       "required": true
     },
     {
-      "projectID": 335493,
-      "fileID": 3356224,
+      "projectID": 381257,
+      "fileID": 3395949,
       "required": true
     },
     {
@@ -91,7 +101,7 @@
     },
     {
       "projectID": 308702,
-      "fileID": 3400185,
+      "fileID": 3431313,
       "required": true
     },
     {
@@ -101,7 +111,12 @@
     },
     {
       "projectID": 459857,
-      "fileID": 3373736,
+      "fileID": 3435174,
+      "required": true
+    },
+    {
+      "projectID": 477078,
+      "fileID": 3424444,
       "required": true
     },
     {
@@ -131,7 +146,7 @@
     },
     {
       "projectID": 408481,
-      "fileID": 3373447,
+      "fileID": 3420209,
       "required": true
     },
     {
@@ -145,13 +160,13 @@
       "required": true
     },
     {
-      "projectID": 398774,
-      "fileID": 3383929,
+      "projectID": 353890,
+      "fileID": 3357144,
       "required": true
     },
     {
-      "projectID": 353890,
-      "fileID": 3357144,
+      "projectID": 400322,
+      "fileID": 3436762,
       "required": true
     }
   ],

diff --git a/Curseforge/modlist.html b/Curseforge/modlist.html
@@ -2,6 +2,7 @@
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/fastchest">FastChest (by fake_domi)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/cloth-config">Cloth Config API (Fabric) (by shedaniel)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/entityculling">Entity Culling Fabric/Forge (by tr9zw)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/colormatic">Colormatic (by kwertiTheCats)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/item-model-fix">Item Model Fix (Fabric) (by Pepper_Bell)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/architectury-fabric">Architectury API (Fabric) (by shedaniel)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/cloth-api">Cloth API (Fabric) (by shedaniel)</a></li>
@@ -10,13 +11,15 @@
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/lambdynamiclights">LambDynamicLights (by LambdAurora)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/fabric-api">Fabric API (by modmuss50)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/smooth-boot">Smooth Boot (Fabric) (by UltimateBoomer)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/wi-zoom">WI Zoom (by alexander9892)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/dynamic-fps">Dynamic FPS (by juliand665)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/wi-zoom">WI Zoom (by alexander9892)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/completeconfig">CompleteConfig (by Lortseam_)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/lazydfu">LazyDFU (by tuxed)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/fabric-language-kotlin">Fabric Language Kotlin (by modmuss50)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/modmenu">Mod Menu (by ProspectorDev)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/slight-gui-modifications">'Slight' Gui Modifications (by shedaniel)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/ferritecore-fabric">FerriteCore (Fabric) (by malte0811)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/custom-entity-models-cem">Custom Entity Models (CEM) (by dorianpb)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/better-beds">Better Beds (by Motschen)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/irisshaders">Iris Shaders (by coderbot)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/lithium">Lithium (Fabric) (by jellysquid3)</a></li>
@@ -25,6 +28,6 @@
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/capes">Fabric Capes (by VictorKohler)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/antighost">AntiGhost (by Giselbaer)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/fabrishot">Fabrishot (by ramidzkh)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/custom-fog">Custom Fog (by Setadokalo)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/not-enough-crashes">Not Enough Crashes (Fabric) (by NatanFudge)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/lambdabettergrass">LambdaBetterGrass (by LambdAurora)</a></li>
 </ul>
diff --git a/MultiMC/Fabulously Optimized x.y.z/instance.cfg b/MultiMC/Fabulously Optimized x.y.z/instance.cfg
@@ -36,8 +36,8 @@ UseNativeGLFW=false
 UseNativeOpenAL=false
 WrapperCommand=
 iconKey=pack
-lastLaunchTime=1628784738138
-lastTimePlayed=71
-name=Fabulously Optimized 2.1.0-beta.3
+lastLaunchTime=1629896038177
+lastTimePlayed=129
+name=Fabulously Optimized 2.1.0-beta.4
 notes=https://www.curseforge.com/minecraft/modpacks/fabulously-optimized
-totalTimePlayed=887
+totalTimePlayed=1026
diff --git a/Packwiz/config/slightguimodifications/cts.groovy b/Packwiz/config/slightguimodifications/cts.groovy
@@ -5,7 +5,7 @@ mainMenu {
             x { it - 2 }
             y { it - 20 }
         }
-        text = literal("Fabulously Optimized 2.1.0-beta.3")
+        text = literal("Fabulously Optimized 2.1.0-beta.4")
         align = "right"
         color = 0xFFFFFF
         hoveredColor = 0x55FFFF

diff --git a/Packwiz/config/yosbr/config/cem.conf b/Packwiz/config/yosbr/config/cem.conf
@@ -0,0 +1,2 @@
+"use_new_model_creation_fix"=true
+"use_optifine_folder"=true
diff --git a/Packwiz/config/yosbr/config/colormatic.properties b/Packwiz/config/yosbr/config/colormatic.properties
@@ -0,0 +1,6 @@
+#Colormatic Config
+#Wed Aug 25 14:41:01 EEST 2021
+fog.clearSky=false
+light.flickerBlockLight=true
+fog.clearVoid=false
+light.blendSkyLight=true
diff --git a/Packwiz/config/yosbr/config/enhanced_bes.properties b/Packwiz/config/yosbr/config/enhanced_bes.properties
diff --git a/Packwiz/config/yosbr/config/fast-chest.properties b/Packwiz/config/yosbr/config/fast-chest.properties
@@ -0,0 +1,3 @@
+#FastChest config file
+#Wed Aug 25 14:55:11 EEST 2021
+simplifiedChest=true
diff --git a/Packwiz/config/yosbr/config/lambdabettergrass.toml b/Packwiz/config/yosbr/config/lambdabettergrass.toml
@@ -0,0 +1,8 @@
+# LambdaBetterGrass configuration.
+# The better grass mode. Values: "off", "fastest", "fast" and "fancy".
+mode = "fast"
+# Debug mode. Debug mode allows to output the generated texture in the debug folder of your minecraft instance.
+debug = false
+# The better layer option.
+better_layer = true
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		"use_new_model_creation_fix"=true
		"use_optifine_folder"=true