Skip to content

Commit

Permalink
collapse taters
Browse files Browse the repository at this point in the history
also give some shifts to a couple
  • Loading branch information
yrsegal committed Oct 2, 2023
1 parent a587d2d commit 1ce0be0
Show file tree
Hide file tree
Showing 39 changed files with 82 additions and 139 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/aro"
}
"parent": "quark:tiny_potato/aromantictater"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/bi"
}
"parent": "quark:tiny_potato/bitater"
}
7 changes: 7 additions & 0 deletions src/main/resources/assets/quark/models/tiny_potato/bob.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
"particle": "quark:model/tiny_potato/bob",
"all": "quark:model/tiny_potato/bob"
},
"display": {
"firstperson_righthand": {
"rotation": [ -36, 137, 20 ],
"translation": [ 1, 3.6, 0 ],
"scale": [ 0.40, 0.40, 0.40 ]
}
},
"elements": [
{
"from": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/bosnia"
}
"parent": "quark:tiny_potato/bosniantater"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/bosnia"
}
"parent": "quark:tiny_potato/bosniantater"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/bosnia"
}
"parent": "quark:tiny_potato/bosniantater"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/bosnia"
}
"parent": "quark:tiny_potato/bosniantater"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/bosnia"
}
"parent": "quark:tiny_potato/bosniantater"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/bosnia"
}
"parent": "quark:tiny_potato/bosniantater"
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
{
"parent": "minecraft:block/cube_all",
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/default"
},
"display": {
"firstperson_righthand": {
"rotation": [ -36, 137, 20 ],
"translation": [ 1, 3.6, 0 ],
"scale": [ 0.40, 0.40, 0.40 ]
}
},
"elements": [
{
"from": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/trans"
}
"parent": "quark:tiny_potato/transtater"

}
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/wire"
}
"parent": "quark:tiny_potato/enbytater"

}
5 changes: 1 addition & 4 deletions src/main/resources/assets/quark/models/tiny_potato/gay.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/pride"
}
"parent": "quark:tiny_potato/pridetater"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/pride"
}
"parent": "quark:tiny_potato/pridetater"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/pride"
}
"parent": "quark:tiny_potato/gaytater"

}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/lesbian"
}
"parent": "quark:tiny_potato/lesbiantater"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/gray"
}
"parent": "quark:tiny_potato/graytater"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/gray"
}
"parent": "quark:tiny_potato/graytater"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/gray"
}
"parent": "quark:tiny_potato/graytater"
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
{
"parent": "minecraft:block/cube_all",
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/default"
},
"display": {
"firstperson_righthand": {
"rotation": [ -36, 137, 6 ],
"translation": [ -1, 3, 0 ],
"scale": [ 0.40, 0.40, 0.40 ]
},
"thirdperson_righthand": {
"rotation": [ 0, 162, 0 ],
"translation": [ -1, 2, 1 ],
"scale": [ 0.40, 0.40, 0.40 ]
}
},
"elements": [
{
"from": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/gray"
}
"parent": "quark:tiny_potato/graytater"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/lesbian"
}
"parent": "quark:tiny_potato/lesbiantater"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/lesbian"
}
"parent": "quark:tiny_potato/lesbiantater"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/lesbian"
}
"parent": "quark:tiny_potato/lesbiantater"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/lesbian"
}
"parent": "quark:tiny_potato/lesbiantater"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/pride"
}
"parent": "quark:tiny_potato/gaytater"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/wire"
}
"parent": "quark:tiny_potato/enbytater"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/wire"
}
"parent": "quark:tiny_potato/enbytater"
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
{
"parent": "minecraft:block/cube_all",
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/default"
},
"display": {
"firstperson_righthand": {
"rotation": [ -36, 137, 0 ],
"translation": [ 1, 3.75, 0 ],
"scale": [ 0.40, 0.40, 0.40 ]
}
},
"elements": [
{
"from": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/pan"
}
"parent": "quark:tiny_potato/pantater"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/halloween"
}
"parent": "quark:tiny_potato/halloween"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/halloween"
}
"parent": "quark:tiny_potato/halloween"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/ace"
}
"parent": "quark:tiny_potato/acetater"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/ace"
}
"parent": "quark:tiny_potato/acetater"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/aro"
}
"parent": "quark:tiny_potato/aromantictater"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/trans"
}
"parent": "quark:tiny_potato/transtater"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/genderfluid"
}
"parent": "quark:tiny_potato/genderfluidtater"

}
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{
"parent": "quark:tiny_potato/base",
"display": {
"firstperson_righthand": {
"rotation": [ -36, 137, 20 ],
"translation": [ 1, 3.325, 0 ],
"scale": [ 0.40, 0.40, 0.40 ]
}
},
"textures": {
"all": "quark:model/tiny_potato/tomato"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
"parent": "quark:tiny_potato/base",
"textures": {
"all": "quark:model/tiny_potato/wire"
}
"parent": "quark:tiny_potato/enbytater"

}

0 comments on commit 1ce0be0

Please sign in to comment.