Skip to content

Commit 8cc81c1

Browse files
jagprog5jagprog5
committed
better git integration
1 parent 4f76190 commit 8cc81c1

File tree

158 files changed

+14548
-14325
lines changed

Some content is hidden

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

158 files changed

+14548
-14325
lines changed

‎.gitattributes‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.nbt diff=nbt
2+
*.json diff=json

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- main
7-
87
jobs:
98
build_release:
109
name: build_release
@@ -17,7 +16,7 @@ jobs:
1716
- name: build
1817
run: zip -r profile.zip overrides manifest.json
1918
- name: version
20-
run: echo "version=$(./scripts/get_manifest_version.py)" >> $GITHUB_OUTPUT
19+
run: echo 'version=$(python3 -c "import json;print(json.load(open(\"manifest.json\"))[\"manifestVersion\"])")' >> $GITHUB_OUTPUT
2120
id: version
2221
- name: release
2322
# enabled Workflow write permission

‎.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
*.zip
2-
profile_temp
1+
*.zip

‎README.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,12 @@ server. This repo may be updated and if it is then the server mods will be kept
3838
## Troubleshooting
3939

4040
If the game starts with a blank screen then delete `options.txt` and restart; this issues was seen on a MacBook.
41+
42+
# Development
43+
44+
For better diff viewing:
45+
46+
```bash
47+
git config diff.nbt.textconv "python3 scripts/nbt_textconv.py"
48+
git config diff.json.textconv "python3 -c 'import sys,json;json.dump(json.load(open(sys.argv[1])),sys.stdout,indent=2);print()'"
49+
```

‎manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
]
1010
},
1111
"manifestType": "minecraftModpack",
12-
"manifestVersion": 18,
12+
"manifestVersion": 19,
1313
"name": "John's 1.12.2",
1414
"author": "",
1515
"files": [

‎modlist.md‎

Lines changed: 108 additions & 108 deletions
Large diffs are not rendered by default.

‎notes.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/give @p minecraft:wooden_axe 1 10000 {AttributeModifiers:[{Slot:"mainhand",AttributeName:generic.attackSpeed,Name:generic.attackSpeed,Amount:-3.95,Operation:0,UUIDLeast:-590699294,UUIDMost:-871380948}],display:{Name:"Lesser Boom Axe",Lore:["Annihilates itself after one use"]},ench:[{id:16,lvl:50},{id:19,lvl:5},{id:51,lvl:1}]}
2+
3+
4+
/give @a leather_boots 1 0 {display:{color:16777215,Name:"Traveller's Boots"},ench:[{lvl:4,id:2},{lvl:3,id:34}],AttributeModifiers:[{AttributeName:generic.movementSpeed,Name:generic.movementSpeed,Amount:0.01,Slot:feet,UUIDLeast:245670800,UUIDMost:983294}]}
5+
6+
7+
1. commit this
8+
2. update modpack-server

‎overrides/config/ChickenChunks.cfg‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎overrides/config/CustomMainMenu/mainmenu.json‎

Lines changed: 139 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -1,140 +1,140 @@
1-
{
2-
"images":
3-
{
4-
"transparent":
5-
{
6-
"image" : "j_main_menu:translucent_black.png",
7-
"posX" : 0,
8-
"posY" : 0,
9-
"width" : 100000,
10-
"height" : 100000
11-
},
12-
13-
"title":
14-
{
15-
"image" : "j_main_menu:title.png",
16-
"posX" : -108,
17-
"posY" : -80,
18-
"width" : 216,
19-
"height" : 32,
20-
"alignment" : "center"
21-
}
22-
23-
},
24-
25-
"buttons":
26-
{
27-
"singleplayer":
28-
{
29-
"text" : "menu.singleplayer",
30-
"posX" : -50,
31-
"posY" : -25,
32-
"width" : 100,
33-
"height" : 20,
34-
"alignment" : "center",
35-
"texture" : "j_main_menu:transparent.png",
36-
"shadow" : false,
37-
"action" :
38-
{
39-
"type" : "openGui",
40-
"gui" : "singleplayer"
41-
}
42-
},
43-
44-
"multiplayer":
45-
{
46-
"text" : "menu.multiplayer",
47-
"posX" : -50,
48-
"posY" : -5,
49-
"width" : 100,
50-
"height" : 20,
51-
"alignment" : "center",
52-
"texture" : "j_main_menu:transparent.png",
53-
"shadow" : false,
54-
"action" :
55-
{
56-
"type" : "openGui",
57-
"gui" : "multiplayer"
58-
}
59-
},
60-
61-
"mods":
62-
{
63-
"text" : "fml.menu.mods",
64-
"posX" : -50,
65-
"posY" : 15,
66-
"width" : 100,
67-
"height" : 20,
68-
"alignment" : "center",
69-
"texture" : "j_main_menu:transparent.png",
70-
"shadow" : false,
71-
"action" :
72-
{
73-
"type" : "openGui",
74-
"gui" : "mods"
75-
}
76-
},
77-
78-
"options":
79-
{
80-
"text" : "menu.options",
81-
"posX" : -50,
82-
"posY" : 35,
83-
"width" : 100,
84-
"height" : 20,
85-
"alignment" : "center",
86-
"texture" : "j_main_menu:transparent.png",
87-
"shadow" : false,
88-
"action" :
89-
{
90-
"type" : "openGui",
91-
"gui" : "options"
92-
}
93-
},
94-
95-
"language":
96-
{
97-
"text" : "Language",
98-
"posX" : -50,
99-
"posY" : 55,
100-
"width" : 100,
101-
"height" : 20,
102-
"alignment" : "center",
103-
"texture" : "j_main_menu:transparent.png",
104-
"shadow" : false,
105-
"action" :
106-
{
107-
"type" : "openGui",
108-
"gui" : "languages"
109-
}
110-
},
111-
112-
"quit":
113-
{
114-
"text" : "menu.quit",
115-
"posX" : -50,
116-
"posY" : 75,
117-
"width" : 100,
118-
"height" : 20,
119-
"alignment" : "center",
120-
"texture" : "j_main_menu:transparent.png",
121-
"shadow" : false,
122-
"action" :
123-
{
124-
"type" : "quit"
125-
}
126-
}
127-
},
128-
129-
"other":
130-
{
131-
"panorama":
132-
{
133-
"images" : "minecraft:textures/gui/title/background/panorama_%c.png",
134-
"animate" : true,
135-
"animationSpeed" : 1,
136-
"blur" : true,
137-
"gradient" : true
138-
}
139-
}
1+
{
2+
"images":
3+
{
4+
"transparent":
5+
{
6+
"image" : "j_main_menu:translucent_black.png",
7+
"posX" : 0,
8+
"posY" : 0,
9+
"width" : 100000,
10+
"height" : 100000
11+
},
12+
13+
"title":
14+
{
15+
"image" : "j_main_menu:title.png",
16+
"posX" : -108,
17+
"posY" : -80,
18+
"width" : 216,
19+
"height" : 32,
20+
"alignment" : "center"
21+
}
22+
23+
},
24+
25+
"buttons":
26+
{
27+
"singleplayer":
28+
{
29+
"text" : "menu.singleplayer",
30+
"posX" : -50,
31+
"posY" : -25,
32+
"width" : 100,
33+
"height" : 20,
34+
"alignment" : "center",
35+
"texture" : "j_main_menu:transparent.png",
36+
"shadow" : false,
37+
"action" :
38+
{
39+
"type" : "openGui",
40+
"gui" : "singleplayer"
41+
}
42+
},
43+
44+
"multiplayer":
45+
{
46+
"text" : "menu.multiplayer",
47+
"posX" : -50,
48+
"posY" : -5,
49+
"width" : 100,
50+
"height" : 20,
51+
"alignment" : "center",
52+
"texture" : "j_main_menu:transparent.png",
53+
"shadow" : false,
54+
"action" :
55+
{
56+
"type" : "openGui",
57+
"gui" : "multiplayer"
58+
}
59+
},
60+
61+
"mods":
62+
{
63+
"text" : "fml.menu.mods",
64+
"posX" : -50,
65+
"posY" : 15,
66+
"width" : 100,
67+
"height" : 20,
68+
"alignment" : "center",
69+
"texture" : "j_main_menu:transparent.png",
70+
"shadow" : false,
71+
"action" :
72+
{
73+
"type" : "openGui",
74+
"gui" : "mods"
75+
}
76+
},
77+
78+
"options":
79+
{
80+
"text" : "menu.options",
81+
"posX" : -50,
82+
"posY" : 35,
83+
"width" : 100,
84+
"height" : 20,
85+
"alignment" : "center",
86+
"texture" : "j_main_menu:transparent.png",
87+
"shadow" : false,
88+
"action" :
89+
{
90+
"type" : "openGui",
91+
"gui" : "options"
92+
}
93+
},
94+
95+
"language":
96+
{
97+
"text" : "Language",
98+
"posX" : -50,
99+
"posY" : 55,
100+
"width" : 100,
101+
"height" : 20,
102+
"alignment" : "center",
103+
"texture" : "j_main_menu:transparent.png",
104+
"shadow" : false,
105+
"action" :
106+
{
107+
"type" : "openGui",
108+
"gui" : "languages"
109+
}
110+
},
111+
112+
"quit":
113+
{
114+
"text" : "menu.quit",
115+
"posX" : -50,
116+
"posY" : 75,
117+
"width" : 100,
118+
"height" : 20,
119+
"alignment" : "center",
120+
"texture" : "j_main_menu:transparent.png",
121+
"shadow" : false,
122+
"action" :
123+
{
124+
"type" : "quit"
125+
}
126+
}
127+
},
128+
129+
"other":
130+
{
131+
"panorama":
132+
{
133+
"images" : "minecraft:textures/gui/title/background/panorama_%c.png",
134+
"animate" : true,
135+
"animationSpeed" : 1,
136+
"blur" : true,
137+
"gradient" : true
138+
}
139+
}
140140
}

0 commit comments

Comments
 (0)