Compare commits

..

No commits in common. "master" and "test2" have entirely different histories.

11 changed files with 13 additions and 570 deletions

View File

@ -301,291 +301,6 @@
}
}
},
"animation.bisharp.blink": {
"loop": true,
"animation_length": 2,
"bones": {
"head": {
"rotation": {
"0.0": {
"post": [12.5, 0, 0],
"lerp_mode": "catmullrom"
},
"0.25": {
"post": [7.5, 0, 0],
"lerp_mode": "catmullrom"
},
"0.7083": {
"post": [15.82, 0, 0],
"lerp_mode": "catmullrom"
},
"1.0": {
"post": [12.5, 0, 0],
"lerp_mode": "catmullrom"
}
}
},
"leg_upper_left": {
"rotation": {
"0.0": {
"post": [10, -10, 0],
"lerp_mode": "catmullrom"
},
"1.0": {
"post": [10, -10, 0],
"lerp_mode": "catmullrom"
}
},
"position": {
"0.0": {
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
},
"0.5": {
"post": [0, -0.25, 0],
"lerp_mode": "catmullrom"
},
"1.0": {
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
}
}
},
"torso": {
"rotation": {
"0.0": {
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
},
"0.5": {
"post": [2.5, 0, 0],
"lerp_mode": "catmullrom"
},
"1.0": {
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
}
},
"position": {
"0.0": {
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
},
"0.5": {
"post": [0, -0.25, 0],
"lerp_mode": "catmullrom"
},
"1.0": {
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
}
}
},
"bone9": {
"rotation": {
"0.0": {
"post": [12.31594, -2.15393, -32.73242],
"lerp_mode": "catmullrom"
},
"0.25": {
"post": [12.45392, -1.08089, -37.61794],
"lerp_mode": "catmullrom"
},
"1.0": {
"post": [12.5, 0, -42.5],
"lerp_mode": "catmullrom"
}
}
},
"bone10": {
"rotation": {
"0.0": {
"post": [-23.8378, 14.94159, -17.67544],
"lerp_mode": "catmullrom"
},
"0.4583": {
"post": [-22.52537, 16.91101, -12.89579],
"lerp_mode": "catmullrom"
},
"1.0": {
"post": [-23.8378, 14.94159, -17.67544],
"lerp_mode": "catmullrom"
}
}
},
"bone14": {
"rotation": {
"0.0": {
"post": [0, 0, -15],
"lerp_mode": "catmullrom"
},
"1.0": {
"post": [0, 0, -15],
"lerp_mode": "catmullrom"
}
}
},
"bone18": {
"rotation": {
"0.0": {
"post": [0, 0, -17.5],
"lerp_mode": "catmullrom"
},
"1.0": {
"post": [0, 0, -17.5],
"lerp_mode": "catmullrom"
}
}
},
"bone2": {
"rotation": {
"0.0": {
"post": [325.53807, -72.93693, -326.69307],
"lerp_mode": "catmullrom"
},
"0.25": {
"post": [17.43745, 1.50179, 37.73032],
"lerp_mode": "catmullrom"
},
"1.0": {
"post": [17.5, 0, 42.5],
"lerp_mode": "catmullrom"
}
}
},
"bone3": {
"rotation": {
"0.0": {
"post": [-90, 0, 42.5],
"lerp_mode": "catmullrom"
},
"0.4583": {
"post": [-27.41063, -2.30644, 13.06255],
"lerp_mode": "catmullrom"
},
"1.0": {
"post": [-27.5, 0, 17.5],
"lerp_mode": "catmullrom"
}
}
},
"bone7": {
"rotation": {
"0.0": {
"post": [0, 0, 15],
"lerp_mode": "catmullrom"
},
"1.0": {
"post": [0, 0, 15],
"lerp_mode": "catmullrom"
}
}
},
"bone8": {
"rotation": {
"0.0": {
"post": [0, 0, 7.5],
"lerp_mode": "catmullrom"
},
"1.0": {
"post": [0, 0, 7.5],
"lerp_mode": "catmullrom"
}
}
},
"bone4": {
"rotation": {
"0.0": {
"post": [-2.30991, -0.95645, -22.48072],
"lerp_mode": "catmullrom"
},
"1.0": {
"post": [-2.5, 0, 0],
"lerp_mode": "catmullrom"
}
}
},
"bone15": {
"position": {
"0.0": {
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
},
"0.5": {
"post": [0, 0.25, 0],
"lerp_mode": "catmullrom"
},
"1.0": {
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
}
}
},
"bone5": {
"rotation": {
"0.0": {
"post": [-7.05239, 2.55868, 19.8423],
"lerp_mode": "catmullrom"
},
"1.0": {
"post": [-7.5, 0, 0],
"lerp_mode": "catmullrom"
}
}
},
"leg_upper_right": {
"rotation": {
"0.0": {
"post": [0, 10, 0],
"lerp_mode": "catmullrom"
},
"1.0": {
"post": [0, 10, 0],
"lerp_mode": "catmullrom"
}
},
"position": {
"0.0": {
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
},
"0.5": {
"post": [0, -0.25, 0],
"lerp_mode": "catmullrom"
},
"1.0": {
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
}
}
},
"bone16": {
"position": {
"0.0": {
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
},
"0.5": {
"post": [0, 0.25, 0],
"lerp_mode": "catmullrom"
},
"1.0": {
"post": [0, 0, 0],
"lerp_mode": "catmullrom"
}
}
},
"bone13": {
"rotation": [0, 0, 17.5]
},
"bone17": {
"rotation": [0, 0, -17.5]
},
"arm_left": {
"rotation": [2.27187, -17.4499, -25.1106]
}
}
},
"animation.bisharp.pose": {
"loop": true,
"animation_length": 2,
@ -4401,4 +4116,4 @@
}
}
}
}
}

View File

@ -183,188 +183,6 @@
}
}
},
"animation.pawniard.blink": {
"loop": true,
"animation_length": 2.5,
"bones": {
"mainthing": {
"position": {
"0.0": {
"post": [0, -2, 0],
"lerp_mode": "catmullrom"
},
"1.25": {
"post": [0, -1, 0],
"lerp_mode": "catmullrom"
},
"2.5": {
"post": [0, -2, 0],
"lerp_mode": "catmullrom"
}
}
},
"larm": {
"rotation": {
"0.0": {
"post": [35, 0, 0],
"lerp_mode": "catmullrom"
},
"1.25": {
"post": [40, 0, 0],
"lerp_mode": "catmullrom"
},
"2.5": {
"post": [35, 0, 0],
"lerp_mode": "catmullrom"
}
}
},
"larmseg2": {
"rotation": {
"0.0": {
"post": [0, 60, 0],
"lerp_mode": "catmullrom"
},
"1.25": {
"post": [0, 45, 0],
"lerp_mode": "catmullrom"
},
"2.5": {
"post": [0, 60, 0],
"lerp_mode": "catmullrom"
}
}
},
"lleg": {
"rotation": {
"0.0": {
"post": [-29.82944, -17.97254, 54.94021],
"lerp_mode": "catmullrom"
},
"1.25": {
"post": [-23.13905, -22.59575, 36.88672],
"lerp_mode": "catmullrom"
},
"2.5": {
"post": [-29.82944, -17.97254, 54.94021],
"lerp_mode": "catmullrom"
}
}
},
"lleg2": {
"rotation": {
"0.0": {
"post": [0, 0, -82.5],
"lerp_mode": "catmullrom"
},
"1.25": {
"post": [0, 0, -55],
"lerp_mode": "catmullrom"
},
"2.5": {
"post": [0, 0, -82.5],
"lerp_mode": "catmullrom"
}
}
},
"feetis2": {
"rotation": {
"0.0": {
"post": [5, 0, 30],
"lerp_mode": "catmullrom"
},
"1.25": {
"post": [7.47178, 0.65182, 20.04256],
"lerp_mode": "catmullrom"
},
"2.5": {
"post": [5, 0, 30],
"lerp_mode": "catmullrom"
}
}
},
"rleg": {
"rotation": {
"0.0": {
"post": [17.48436, -0.75155, 49.88443],
"lerp_mode": "catmullrom"
},
"1.25": {
"post": [17.10967, 3.73171, 35.56155],
"lerp_mode": "catmullrom"
},
"2.5": {
"post": [17.48436, -0.75155, 49.88443],
"lerp_mode": "catmullrom"
}
}
},
"rleg2": {
"rotation": {
"0.0": {
"post": [0, 0, -77.5],
"lerp_mode": "catmullrom"
},
"1.25": {
"post": [0, 0, -57.5],
"lerp_mode": "catmullrom"
},
"2.5": {
"post": [0, 0, -77.5],
"lerp_mode": "catmullrom"
}
}
},
"feetis1": {
"rotation": {
"0.0": {
"post": [-12.5, 0, 27.5],
"lerp_mode": "catmullrom"
},
"1.25": {
"post": [-12.39638, -1.61888, 20.17583],
"lerp_mode": "catmullrom"
},
"2.5": {
"post": [-12.5, 0, 27.5],
"lerp_mode": "catmullrom"
}
}
},
"rarm": {
"rotation": {
"0.0": {
"post": [-32.5, 0, 0],
"lerp_mode": "catmullrom"
},
"1.25": {
"post": [-40.02687, 1.91486, -1.60757],
"lerp_mode": "catmullrom"
},
"2.5": {
"post": [-32.5, 0, 0],
"lerp_mode": "catmullrom"
}
}
},
"rarmseg2": {
"rotation": {
"0.0": {
"post": [0, -57.5, 0],
"lerp_mode": "catmullrom"
},
"1.25": {
"post": [0, -47.5, 0],
"lerp_mode": "catmullrom"
},
"2.5": {
"post": [0, -57.5, 0],
"lerp_mode": "catmullrom"
}
}
}
}
},
"animation.pawniard.ground_walk": {
"loop": true,
"animation_length": 1,
@ -1607,4 +1425,4 @@
}
}
}
}
}

View File

@ -1,13 +0,0 @@
name = "MysticMons"
filename = "MysticMons_v2.0.1.zip"
side = "both"
[download]
url = "https://cdn.modrinth.com/data/TiFXQSAQ/versions/OgaAllBB/MysticMons_v2.0.1.zip"
hash-format = "sha512"
hash = "4bb3961fa6c9b7d10fa452345193356951748b349f0a5887c5e09a83171f962878a0d754e2d46b87416c05ca1ea5c25944e0a4cc496962bcdf69cb3b68019585"
[update]
[update.modrinth]
mod-id = "TiFXQSAQ"
version = "OgaAllBB"

View File

@ -21013,11 +21013,6 @@ hash = "ad7d65ad8aecfa80f2dd101bc7a9a0b4418b9fdd96c608c3e51412b0780ea86f"
file = "global_packs/required_data/capture-border-v1.0.0/pack.mcmeta"
hash = "82d35aa519bdf7e5986f63b569b5325e77223d25f058243fd2a46204b78e3f15"
[[files]]
file = "global_packs/required_data/mysticmons.pw.toml"
hash = "268ab60cd8393c81e870d10277cf6bcacd78781db8bbecddcff8ed7beb3cca0b"
metafile = true
[[files]]
file = "global_packs/required_data/saltmons.pw.toml"
hash = "aee8bda9a63a8d79d93f71b006efa3fefd3654b537fc81949be11c63fcd94386"
@ -21845,7 +21840,7 @@ metafile = true
[[files]]
file = "mods/fabric-api.pw.toml"
hash = "c10109cdaa93bb556aa99268af1dce6ca784cd21f4b97800aaad908e761e7b15"
hash = "8de441dd57379d434805fb87722233fa39e346a9152828e7ff49b0ed9b2bd518"
metafile = true
[[files]]
@ -22158,11 +22153,6 @@ file = "mods/puzzles-lib.pw.toml"
hash = "0262df78f767ee3ef2d32c1815b82b2f5710ea7c934bd875639a711197f27342"
metafile = true
[[files]]
file = "mods/quartz-elevator.pw.toml"
hash = "a51cd020fd508be25122d0e3cda8684c82cd4ad2547daecd0a159f3928211077"
metafile = true
[[files]]
file = "mods/resource-pack-overrides.pw.toml"
hash = "c27c5ecee525aa7c5884f0807a34430b14c29a58fd38e1f9e7830969dd1c13d7"
@ -22218,11 +22208,6 @@ file = "mods/shoulder-surfing-reloaded.pw.toml"
hash = "0d8ded113d68c9f1061bead63ccf9b51e13ced181972276e4b47ab637361c6c2"
metafile = true
[[files]]
file = "mods/show-me-what-you-got.pw.toml"
hash = "3f4ebc99e5cfdfebdcaab0eb420af0cfe8952e93566ede25cbea6463119ba0f9"
metafile = true
[[files]]
file = "mods/simple-voice-chat.pw.toml"
hash = "6a35e1cb7d8a681459740410d033fba0cdcde1fed7e5886985c0412b7bdeb5ee"
@ -22273,11 +22258,6 @@ file = "mods/sophisticated-storage-unofficial-fabric-port.pw.toml"
hash = "ae059876286d5b49cbcb33d37b8be3e487c21bde28c0995ebe8cbc095590902b"
metafile = true
[[files]]
file = "mods/spark.pw.toml"
hash = "f010bbe486733738e92241d10f403e28a8feeb40b45ec3af3b2270523f955216"
metafile = true
[[files]]
file = "mods/spawner-controls.pw.toml"
hash = "becdc42be91ea86a07617797ca44945431d47f3da04258874ba717b4f93d32c5"
@ -70517,11 +70497,6 @@ file = "resourcepacks/embellished-stone-advancement-plaques.pw.toml"
hash = "14ef2d3624489c3d2b9fd3311b436d030fa5779e49f9a5662f910ff39d196221"
metafile = true
[[files]]
file = "resourcepacks/mysticmons.pw.toml"
hash = "268ab60cd8393c81e870d10277cf6bcacd78781db8bbecddcff8ed7beb3cca0b"
metafile = true
[[files]]
file = "resourcepacks/smooth-font-32x.pw.toml"
hash = "2f35f14033e281f71213ae72d536562a87ca644779eb41fd27fd5b9820ef7dda"
@ -70538,7 +70513,7 @@ hash = "c84ef2b919f5683bca6d6e0f3bc93aeaafbcdc80d85cdf6ee2538c8ed6c475ca"
[[files]]
file = "servers.dat"
hash = "5e9c0760f630e263a0178b29ca94de28f51a093d462770dec82b2a57fb557895"
hash = "8d5bcf5aaa16a414418e3fb5594cf26af0a052c818292bdec3bc7e3c1acd21d9"
[[files]]
file = "shaderpacks/ComplementaryUnbound_r5.3.zip.txt"

View File

@ -1,13 +1,13 @@
name = "Fabric API"
filename = "fabric-api-0.92.4+1.20.1.jar"
filename = "fabric-api-0.92.2+1.20.1.jar"
side = "both"
[download]
url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/y1pF0uOZ/fabric-api-0.92.4%2B1.20.1.jar"
hash-format = "sha512"
hash = "98b1b65bab63f2dd22b246effc579a1fd31099c3670d0e565c73a1628897f86194fe373dde0e7ae31b69747f8d2160012505ef243fa47b0c466249bde1d620cc"
hash-format = "sha1"
hash = "625ee015ee426d9b677382a7bb661383d89c0807"
mode = "metadata:curseforge"
[update]
[update.modrinth]
mod-id = "P7dR8mSH"
version = "y1pF0uOZ"
[update.curseforge]
file-id = 5383715
project-id = 306612

View File

@ -1,13 +0,0 @@
name = "Quartz Elevator"
filename = "quartz-elevator-2.2.7+1.20.4.jar"
side = "both"
[download]
url = "https://cdn.modrinth.com/data/O9C0qdu8/versions/szdkhw2r/quartz-elevator-2.2.7%2B1.20.4.jar"
hash-format = "sha512"
hash = "ef5f0ccdf893641b93aa7d2871325a3508c53332b685f4120a65de63943963b550678c72a42e1fe79ccf5af683257eaa53700e0e80d25aafb5468eb1527bcd57"
[update]
[update.modrinth]
mod-id = "O9C0qdu8"
version = "szdkhw2r"

View File

@ -1,13 +0,0 @@
name = "Show Me What You Got"
filename = "ShowMeWhatYouGot-1.20-1.1.1.jar"
side = "server"
[download]
url = "https://cdn.modrinth.com/data/jTUiUpsh/versions/fQQ8wvKT/ShowMeWhatYouGot-1.20-1.1.1.jar"
hash-format = "sha512"
hash = "af08c3e83f885f51a5d881cf71a376790e7b20f43e488f3622a5280a1bf6d038d0abce0490813252d525af17f635fa8102e890276c9035c70c4663650f8db069"
[update]
[update.modrinth]
mod-id = "jTUiUpsh"
version = "fQQ8wvKT"

View File

@ -1,13 +0,0 @@
name = "spark"
filename = "spark-1.10.53-fabric.jar"
side = "both"
[download]
url = "https://cdn.modrinth.com/data/l6YH9Als/versions/XGW2fviP/spark-1.10.53-fabric.jar"
hash-format = "sha512"
hash = "ce6e8f7071bb37369ad3e90d844926b424e82d0fe0ffd0db7058abddc9cfcdd594e145c9395677ad70ec532f3da0b23b6862d1f1c20f7600263c215abb4fcea7"
[update]
[update.modrinth]
mod-id = "l6YH9Als"
version = "XGW2fviP"

View File

@ -5,10 +5,10 @@ pack-format = "packwiz:1.1.0"
[index]
file = "index.toml"
hash-format = "sha256"
hash = "ac6b919a346982d276b32aad09c2968cc88a43d4b5328c3b8bd351d68d56731e"
hash = "534d2c9bbb2b9914e04118dcbceb418e23bdcb664e5947f2a8b9f8a706ed2c61"
[versions]
fabric = "0.16.10"
fabric = "0.16.9"
minecraft = "1.20.1"
[options]

View File

@ -1,13 +0,0 @@
name = "MysticMons"
filename = "MysticMons_v2.0.1.zip"
side = "both"
[download]
url = "https://cdn.modrinth.com/data/TiFXQSAQ/versions/OgaAllBB/MysticMons_v2.0.1.zip"
hash-format = "sha512"
hash = "4bb3961fa6c9b7d10fa452345193356951748b349f0a5887c5e09a83171f962878a0d754e2d46b87416c05ca1ea5c25944e0a4cc496962bcdf69cb3b68019585"
[update]
[update.modrinth]
mod-id = "TiFXQSAQ"
version = "OgaAllBB"

Binary file not shown.