Skip to content

Commit

Permalink
3.1.0-alpha.7, Modrinth changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Madis0 committed Jan 7, 2022
1 parent bca1422 commit 7a596d4
Show file tree
Hide file tree
Showing 23 changed files with 712 additions and 629 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ This is the changelog for the Fabric modpack [Fabulously Optimized](https://www.
Notes:
* See an error about "cloth-client-events-v0.mixins.json"? This is known, simply launch again until I find a fix. See [#192](https://github.com/Fabulously-Optimized/fabulously-optimized/issues/192)

### 3.1.0-alpha.6 (2022-01-07)

* Iris got a performance update, the game should run better regardless of whether you have shaders enabled.
* Updated Animatica, Colormatic, Fabric API, Iris Shaders, Reese's Sodium Options

### 3.1.0-alpha.6 (2022-01-02)

Happy new year, time to test Phosphor! [Vote here!](https://github.com/Fabulously-Optimized/fabulously-optimized/issues/21#issuecomment-1003749296)
Expand Down
41 changes: 41 additions & 0 deletions CLI tools/Curseforge to Packwiz-Modrinth.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import os
from zipfile import ZipFile

user_path = os.path.expanduser("~")
git_path = user_path + "/Documents/GitHub/fabulously-optimized/"
version_no = "1.18.1"
packwiz_path = git_path + "Packwiz/" + version_no + "/"
pw_exe_path = "..\packwiz.exe"
mods_path = packwiz_path + "mods"

mod_files = os.listdir(mods_path)
for item in mod_files:
os.remove( os.path.join(mods_path, item))

def extract_file(from_zip, from_file, to_path, from_desc, to_desc):
with ZipFile(from_zip, 'r') as zip:
if from_file in zip.namelist():
zip.extract(from_file, to_path)
print("Copied " + from_desc + " to " + to_desc)
else:
print("Skipped " + from_desc + " copying to " + to_desc + ", didn't exist")


os.chdir(packwiz_path)
cf_zip_path = input("Please drag the Curseforge zip file here: ")[3:][:-1] # Because dragging the file adds "& " and double quotes
os.system(pw_exe_path + " curseforge import \"" + cf_zip_path + "\"")
#os.system(pw_exe_path + " remove hydrogen")
#os.system(pw_exe_path + " mr install hydrogen")
os.system(pw_exe_path + " refresh")

# Copy fresh manifest/modlist to git
extract_file(cf_zip_path, "manifest.json", git_path + "Curseforge", "Curseforge manifest.json", "Git")
extract_file(cf_zip_path, "modlist.html", git_path + "Curseforge", "Curseforge modlist.html", "Git")

# Export Modrinth pack and manifest
os.system(pw_exe_path + " modrinth export")
for pack in os.listdir(packwiz_path):
if pack.endswith('.mrpack'):
extract_file(packwiz_path + "/" + pack, "modrinth.index.json", git_path + "/" + "Modrinth", "Modrinth manifest", "Git")
os.replace(packwiz_path + "/" + pack, os.path.expanduser("~/Desktop") + "/" + pack)
print("Moved " + pack + " to desktop")
33 changes: 0 additions & 33 deletions CLI tools/Curseforge to Packwiz.py

This file was deleted.

105 changes: 0 additions & 105 deletions CLI tools/Packwiz to Modrinth.py

This file was deleted.

32 changes: 16 additions & 16 deletions Curseforge/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"manifestType": "minecraftModpack",
"manifestVersion": 1,
"name": "Fabulously Optimized",
"version": "3.1.0-alpha.6",
"version": "3.1.0-alpha.7",
"author": "robotkoer",
"files": [
{
Expand All @@ -26,7 +26,7 @@
},
{
"projectID": 306612,
"fileID": 3577046,
"fileID": 3595229,
"required": true
},
{
Expand All @@ -50,13 +50,13 @@
"required": true
},
{
"projectID": 372124,
"fileID": 3573395,
"projectID": 399798,
"fileID": 3573935,
"required": true
},
{
"projectID": 399798,
"fileID": 3573935,
"projectID": 372124,
"fileID": 3573395,
"required": true
},
{
Expand All @@ -66,7 +66,7 @@
},
{
"projectID": 511319,
"fileID": 3578930,
"fileID": 3596724,
"required": true
},
{
Expand Down Expand Up @@ -116,7 +116,7 @@
},
{
"projectID": 533006,
"fileID": 3577480,
"fileID": 3594396,
"required": true
},
{
Expand Down Expand Up @@ -205,13 +205,13 @@
"required": true
},
{
"projectID": 455508,
"fileID": 3558900,
"projectID": 452768,
"fileID": 3550935,
"required": true
},
{
"projectID": 452768,
"fileID": 3550935,
"projectID": 455508,
"fileID": 3596182,
"required": true
},
{
Expand All @@ -230,13 +230,13 @@
"required": true
},
{
"projectID": 325092,
"fileID": 3549774,
"projectID": 360438,
"fileID": 3590908,
"required": true
},
{
"projectID": 360438,
"fileID": 3590908,
"projectID": 325092,
"fileID": 3591953,
"required": true
},
{
Expand Down
6 changes: 3 additions & 3 deletions Curseforge/modlist.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<li><a href="https://www.curseforge.com/minecraft/mc-mods/tooltipfix">ToolTipFix (by Kyrptonaught)</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/language-reload">Language Reload (by Jerozgen)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/phosphor">Phosphor (Fabric) (by jellysquid3_)</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/phosphor">Phosphor (Fabric) (by jellysquid3_)</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/reeses-sodium-options">Reese's Sodium Options (by FlashyReese)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/borderless-mining">Borderless Mining (by comp500)</a></li>
Expand Down Expand Up @@ -37,12 +37,12 @@
<li><a href="https://www.curseforge.com/minecraft/mc-mods/dont-clear-chat-history">Don't Clear Chat History (by anar4732)</a></li>
<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/dynamic-fps">Dynamic FPS (by juliand665)</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/no-fade">No Fade (by UltimateBoomer)</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/cloth-config">Cloth Config API (Fabric) (by shedaniel)</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/yosbr">Your Options Shall Be Respected (YOSBR) (by shedaniel)</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/lithium">Lithium (Fabric) (by jellysquid3_)</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/indium">Indium (by comp500)</a></li>
</ul>
Loading

0 comments on commit 7a596d4

Please sign in to comment.