Skip to content

Commit

Permalink
Merge pull request #107 from cubebotfan/fixes
Browse files Browse the repository at this point in the history
Fixes before releasing 1.3.2
  • Loading branch information
cubebotfan authored Aug 25, 2024
2 parents 715a3bd + 0561492 commit d91984d
Show file tree
Hide file tree
Showing 163 changed files with 1,748 additions and 127 deletions.
5 changes: 0 additions & 5 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,6 @@
"projectID":252848,
"required":true
},
{
"fileID":4586447,
"projectID":227657,
"required":true
},
{
"fileID":4049657,
"projectID":376737,
Expand Down
1 change: 0 additions & 1 deletion modlist.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
<li><a href="https://www.curseforge.com/projects/404468">FTB Teams (Forge) (by LatvianModder)</a></li>
<li><a href="https://www.curseforge.com/projects/854949">Fusion (Connected Textures) (by SuperMartijn642)</a></li>
<li><a href="https://www.curseforge.com/projects/388172">GeckoLib (by Gecko, Eliot, AzureDoom, Chappie, DerToaster)</a></li>
<li><a href="https://www.curseforge.com/projects/227657">Global GameRules (by GoryMoon, CFGrafanaStats)</a></li>
<li><a href="https://www.curseforge.com/projects/238911">Grappling Hook Mod (by Yyon, Nyfaria, and Mayesnake)</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>
Expand Down
6 changes: 2 additions & 4 deletions overrides/config/ftbquests/quests/chapters/market.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,11 @@
rewards: [
{
id: "5CAE42EDC4CE4A1D"
type: "command"
type: "custom"
title: "Fortress Locator"
icon: "create:blaze_burner"
tags: [""]
tags: ["fortress"]
auto: "enabled"
command: "/locate betterfortresses:fortress"
player_command: true
}
{
id: "654464FB386A729A"
Expand Down
102 changes: 0 additions & 102 deletions overrides/config/globalgamerules-common.toml

This file was deleted.

94 changes: 94 additions & 0 deletions overrides/kubejs/assets/kubejs/models/block/accellerator.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
{
"credit": "Made with Blockbench",
"texture_size": [32, 32],
"textures": {
"0": "kubejs:block/accellerator_glass",
"particle": "block/glass"
},
"elements": [
{
"from": [2, 0, 2],
"to": [14, 8, 14],
"faces": {
"north": {"uv": [0.5, 0.5, 4.5, 6.5], "rotation": 270, "texture": "#0"},
"east": {"uv": [0.5, 0.5, 4.5, 6.5], "rotation": 270, "texture": "#0"},
"south": {"uv": [0.5, 0.5, 4.5, 6.5], "rotation": 270, "texture": "#0"},
"west": {"uv": [0.5, 0.5, 4.5, 6.5], "rotation": 270, "texture": "#0"},
"up": {"uv": [5, 0.5, 11, 6.5], "texture": "#0"},
"down": {"uv": [5, 0.5, 11, 6.5], "texture": "#0"}
}
},
{
"from": [13, 0, 3],
"to": [3, 8, 13],
"faces": {
"north": {"uv": [0.5, 1, 4.5, 6], "rotation": 270, "texture": "#0"},
"east": {"uv": [0.5, 1, 4.5, 6], "rotation": 270, "texture": "#0"},
"south": {"uv": [0.5, 1, 4.5, 6], "rotation": 270, "texture": "#0"},
"west": {"uv": [0.5, 1, 4.5, 6], "rotation": 270, "texture": "#0"}
}
},
{
"from": [4, 7, 4],
"to": [12, 10, 12],
"faces": {
"north": {"uv": [11.5, 0.5, 15.5, 2], "texture": "#0"},
"east": {"uv": [11.5, 0.5, 15.5, 2], "texture": "#0"},
"south": {"uv": [11.5, 0.5, 15.5, 2], "texture": "#0"},
"west": {"uv": [11.5, 0.5, 15.5, 2], "texture": "#0"},
"up": {"uv": [11.5, 2.5, 15.5, 6.5], "texture": "#0"},
"down": {"uv": [11.5, 2.5, 15.5, 6.5], "texture": "#0"}
}
},
{
"from": [3, 1, 3],
"to": [13, 5, 13],
"faces": {
"north": {"uv": [8, 10.5, 10, 15.5], "rotation": 90, "texture": "#0", "tintindex": 0},
"east": {"uv": [8, 10.5, 10, 15.5], "rotation": 90, "texture": "#0", "tintindex": 0},
"south": {"uv": [8, 10.5, 10, 15.5], "rotation": 90, "texture": "#0", "tintindex": 0},
"west": {"uv": [8, 10.5, 10, 15.5], "rotation": 90, "texture": "#0", "tintindex": 0},
"up": {"uv": [10.5, 10.5, 15.5, 15.5], "rotation": 90, "texture": "#0", "tintindex": 0},
"down": {"uv": [10.5, 10.5, 15.5, 15.5], "rotation": 90, "texture": "#0", "tintindex": 0}
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 0],
"scale": [0.375, 0.375, 0.375]
},
"thirdperson_lefthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 0],
"scale": [0.375, 0.375, 0.375]
},
"firstperson_righthand": {
"rotation": [0, 61, -5],
"translation": [0, 2.25, 0],
"scale": [0.61, 0.61, 0.61]
},
"firstperson_lefthand": {
"rotation": [0, 61, -5],
"translation": [0, 2.25, 0],
"scale": [0.61, 0.61, 0.61]
},
"ground": {
"translation": [0, 3, 0],
"scale": [0.5, 0.5, 0.5]
},
"gui": {
"rotation": [30, 225, 0],
"translation": [0, 2.5, 0],
"scale": [0.84, 0.84, 0.84]
},
"head": {
"translation": [0, 14.5, 0]
},
"fixed": {
"rotation": [0, 45, 0],
"translation": [0, 4, 0]
}
}
}
Loading

0 comments on commit d91984d

Please sign in to comment.