Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(InfinityExpansion): Use original Avaritia's textures, models and mcmetas #101

Open
wants to merge 56 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
7b5551f
add interpolate and frames parameter
jiajia06403 Sep 27, 2024
e7a3236
add interpolate and frames parameter
jiajia06403 Sep 27, 2024
fadba3c
add interpolate and frames parameter
jiajia06403 Sep 27, 2024
81922a9
add interpolate and frames parameter
jiajia06403 Sep 27, 2024
e7e1570
add interpolate and frames parameter
jiajia06403 Sep 27, 2024
4e98a33
add interpolate and frames parameter
jiajia06403 Sep 27, 2024
22c66b8
Merge branch 'main' into main
jiajia06403 Sep 27, 2024
950addc
small change the string place
xMikux Sep 27, 2024
400b54c
Merge branch 'xMikux:main' into main
jiajia06403 Oct 30, 2024
76d2fd1
Merge branch 'xMikux:main' into main
jiajia06403 Nov 12, 2024
2ac9b71
Merge branch 'xMikux:main' into main
jiajia06403 Dec 27, 2024
6858e87
Update infinity_chestplate.png.mcmeta
jiajia06403 Dec 27, 2024
9d77624
Update infinity_chestplate.png.mcmeta
jiajia06403 Dec 27, 2024
b119feb
Update infinity_leggings.png.mcmeta
jiajia06403 Dec 27, 2024
7fb02a9
Add files via upload
jiajia06403 Dec 27, 2024
b959f4b
use original avaritia's texture and mcmeta
jiajia06403 Dec 27, 2024
6516fce
use original avaritia's texture and mcmeta
jiajia06403 Dec 27, 2024
4a90bc6
use original avaritia's texture and mcmeta
jiajia06403 Dec 27, 2024
adf97bc
Update infinite_ingot.png.mcmeta
jiajia06403 Dec 27, 2024
5bb0ffd
Update infinity_matrix.png.mcmeta
jiajia06403 Dec 27, 2024
f4333a9
name fix
jiajia06403 Dec 27, 2024
1356670
grammatical fix
jiajia06403 Dec 27, 2024
349f615
grammatical fix
jiajia06403 Dec 27, 2024
c964869
grammatical fix
jiajia06403 Dec 27, 2024
a29dd9a
grammatical fix
jiajia06403 Dec 27, 2024
28a902d
grammatical fix
jiajia06403 Dec 27, 2024
2c7565c
Update infinite_ingot.png.mcmeta
jiajia06403 Dec 27, 2024
5734da8
add interpolate
jiajia06403 Dec 28, 2024
80806f6
add interpolate
jiajia06403 Dec 28, 2024
433ab0a
add interpolate
jiajia06403 Dec 28, 2024
4996b66
add interpolate
jiajia06403 Dec 28, 2024
3a97071
add interpolate
jiajia06403 Dec 28, 2024
8f24f02
add interpolate
jiajia06403 Dec 28, 2024
3715fda
add interpolate
jiajia06403 Dec 28, 2024
ae66d01
add interpolate
jiajia06403 Dec 28, 2024
54080c7
space fix
jiajia06403 Dec 28, 2024
696c05a
space fix
jiajia06403 Dec 28, 2024
e4c721d
space fix
jiajia06403 Dec 28, 2024
5b9094d
space fix
jiajia06403 Dec 28, 2024
17e37ad
space fix
jiajia06403 Dec 28, 2024
ec29a57
space fix
jiajia06403 Dec 28, 2024
c030bf6
space fix
jiajia06403 Dec 28, 2024
df5502e
space fix
jiajia06403 Dec 28, 2024
d953e88
space fix
jiajia06403 Dec 28, 2024
acbeacf
new layer for
jiajia06403 Dec 28, 2024
5632bb7
new layer for infinity_blade
jiajia06403 Dec 28, 2024
81f811d
Update infinity_chestplate.png.mcmeta
jiajia06403 Dec 28, 2024
a993142
Update infinity_leggings.png.mcmeta
jiajia06403 Dec 28, 2024
6c12941
Update infinity_leggings_e.png.mcmeta
jiajia06403 Dec 28, 2024
ce55789
Update infinity_chestplate_e.png.mcmeta
jiajia06403 Dec 28, 2024
6745bbb
new singularity text
jiajia06403 Dec 28, 2024
bec397b
missing ',' fix
jiajia06403 Dec 28, 2024
48e68aa
Update infinite_ingot.png.mcmeta
jiajia06403 Dec 28, 2024
1fa7e85
infinity tools' optifine cit modify, Also added the glowing texture f…
jiajia06403 Dec 29, 2024
292e360
update optifine cit _e
jiajia06403 Jan 3, 2025
cae9d7c
interpolate
jiajia06403 Jan 3, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"animation":{
"frametime": 3
"animation": {
"interpolate": true,
"frametime": 1,
"frames": [0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 6, 7, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1]
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"animation":{
"frametime": 3
"animation": {
"interpolate": true,
"frametime": 1,
"frames": [0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 6, 7, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1]
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"animation":{
"frametime": 3
"animation": {
"interpolate": true,
"frametime": 1,
"frames": [0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 6, 7, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1]
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"animation":{
"frametime": 3
"animation": {
"interpolate": true,
"frametime": 1,
"frames": [0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 6, 7, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1]
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"animation": {
"interpolate": true,
"frametime": 1,
"frames": [0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 6, 7, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1]
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation": {
"interpolate": true,
"frametime": 2
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"animation": {
"interpolate": true,
"frametime": 1,
"frames": [0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 6, 7, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1]
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"animation": {
"interpolate": true,
"frametime": 1,
"frames": [0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 6, 7, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1]
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"animation": {
"interpolate": true,
"frametime": 1,
"frames": [0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 6, 7, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1]
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"animation": {
"interpolate": true,
"frametime": 1,
"frames": [0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 6, 7, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1]
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"animation": {
"interpolate": true,
"frametime": 1,
"frames": [0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 6, 7, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1]
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"animation": {
"interpolate": true,
"frametime": 1,
"frames": [0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 6, 7, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1]
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"animation": {
"interpolate": true,
"frametime": 1,
"frames": [0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 6, 7, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1]
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"animation": {
"interpolate": true,
"frametime": 1,
"frames": [0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 6, 7, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1]
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"animation": {
"interpolate": true,
"frametime": 1,
"frames": [0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 6, 7, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1]
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"animation": {
"interpolate": true,
"frametime": 1,
"frames": [0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 6, 7, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1]
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"animation": {
"interpolate": true,
"frametime": 1,
"frames": [0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 6, 7, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1]
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"animation": {
"interpolate": true,
"frametime": 1,
"frames": [0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 6, 7, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1]
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"parent": "block/cube_all",
"parent": "item/generated",
"author": "Caribax",
"textures": {
"all": "infinityexpansion:materials/materials2/aluminum_singularity"
"layer0": "infinityexpansion:materials/materials2/aluminum_singularity_layer_0",
"layer1": "infinityexpansion:materials/materials2/aluminum_singularity_layer_1"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"parent": "block/cube_all",
"parent": "item/generated",
"author": "Caribax",
"textures": {
"all": "infinityexpansion:materials/materials2/coal_singularity"
"layer0": "infinityexpansion:materials/materials2/coal_singularity_layer_0",
"layer1": "infinityexpansion:materials/materials2/coal_singularity_layer_1"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"parent": "block/cube_all",
"parent": "item/generated",
"author": "Caribax",
"textures": {
"all": "infinityexpansion:materials/materials2/copper_singularity"
"layer0": "infinityexpansion:materials/materials2/copper_singularity_layer_0",
"layer1": "infinityexpansion:materials/materials2/copper_singularity_layer_1"
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"parent": "block/cube_all",
"parent": "item/generated",
"author": "Caribax",
"textures": {
"all": "infinityexpansion:materials/materials2/diamond_singularity"
"layer0": "infinityexpansion:materials/materials2/diamond_singularity_layer_0",
"layer1": "infinityexpansion:materials/materials2/diamond_singularity_layer_1"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"parent": "block/cube_all",
"parent": "item/generated",
"author": "Caribax",
"textures": {
"all": "infinityexpansion:materials/materials2/emerald_singularity"
"layer0": "infinityexpansion:materials/materials2/emerald_singularity_layer_0",
"layer1": "infinityexpansion:materials/materials2/emerald_singularity_layer_1"
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"parent": "block/cube_all",
"parent": "item/generated",
"author": "Caribax",
"textures": {
"all": "infinityexpansion:materials/materials2/gold_singularity"
"layer0": "infinityexpansion:materials/materials2/gold_singularity_layer_0",
"layer1": "infinityexpansion:materials/materials2/gold_singularity_layer_1"
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"parent": "block/cube_all",
"parent": "item/generated",
"author": "Caribax",
"textures": {
"all": "infinityexpansion:materials/materials2/infinity_singularity"
"layer0": "infinityexpansion:materials/materials2/infinity_singularity_layer_0",
"layer1": "infinityexpansion:materials/materials2/infinity_singularity_layer_1"
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"parent": "block/cube_all",
"parent": "item/generated",
"author": "Caribax",
"textures": {
"all": "infinityexpansion:materials/materials2/iron_singularity"
"layer0": "infinityexpansion:materials/materials2/iron_singularity_layer_0",
"layer1": "infinityexpansion:materials/materials2/iron_singularity_layer_1"
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"parent": "block/cube_all",
"parent": "item/generated",
"author": "Caribax",
"textures": {
"all": "infinityexpansion:materials/materials2/lapis_singularity"
"layer0": "infinityexpansion:materials/materials2/lapis_singularity_layer_0",
"layer1": "infinityexpansion:materials/materials2/lapis_singularity_layer_1"
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"parent": "block/cube_all",
"parent": "item/generated",
"author": "Caribax",
"textures": {
"all": "infinityexpansion:materials/materials2/lead_singularity"
"layer0": "infinityexpansion:materials/materials2/lead_singularity_layer_0",
"layer1": "infinityexpansion:materials/materials2/lead_singularity_layer_1"
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"parent": "block/cube_all",
"parent": "item/generated",
"author": "Caribax",
"textures": {
"all": "infinityexpansion:materials/materials2/magnesium_singularity"
"layer0": "infinityexpansion:materials/materials2/magnesium_singularity_layer_0",
"layer1": "infinityexpansion:materials/materials2/magnesium_singularity_layer_1"
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"parent": "block/cube_all",
"parent": "item/generated",
"author": "Caribax",
"textures": {
"all": "infinityexpansion:materials/materials2/netherite_singularity"
"layer0": "infinityexpansion:materials/materials2/netherite_singularity_layer_0",
"layer1": "infinityexpansion:materials/materials2/netherite_singularity_layer_1"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"parent": "block/cube_all",
"parent": "item/generated",
"author": "Caribax",
"textures": {
"all": "infinityexpansion:materials/materials2/quartz_singularity"
"layer0": "infinityexpansion:materials/materials2/quartz_singularity_layer_0",
"layer1": "infinityexpansion:materials/materials2/quartz_singularity_layer_1"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"parent": "block/cube_all",
"parent": "item/generated",
"author": "Caribax",
"textures": {
"all": "infinityexpansion:materials/materials2/redstone_singularity"
"layer0": "infinityexpansion:materials/materials2/redstone_singularity_layer_0",
"layer1": "infinityexpansion:materials/materials2/redstone_singularity_layer_1"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"parent": "block/cube_all",
"parent": "item/generated",
"author": "Caribax",
"textures": {
"all": "infinityexpansion:materials/materials2/silver_singularity"
"layer0": "infinityexpansion:materials/materials2/silver_singularity_layer_0",
"layer1": "infinityexpansion:materials/materials2/silver_singularity_layer_1"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"parent": "block/cube_all",
"parent": "item/generated",
"author": "Caribax",
"textures": {
"all": "infinityexpansion:materials/materials2/tin_singularity"
"layer0": "infinityexpansion:materials/materials2/tin_singularity_layer_0",
"layer1": "infinityexpansion:materials/materials2/tin_singularity_layer_1"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"parent": "block/cube_all",
"parent": "item/generated",
"author": "Caribax",
"textures": {
"all": "infinityexpansion:materials/materials2/zinc_singularity"
"layer0": "infinityexpansion:materials/materials2/zinc_singularity_layer_0",
"layer1": "infinityexpansion:materials/materials2/zinc_singularity_layer_1"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"parent": "item/handheld",
"author": "Caribax",
"textures": {
"layer0": "infinityexpansion:tools/infinity_blade"
"layer0": "infinityexpansion:tools/infinity_blade",
"layer1": "infinityexpansion:tools/infinity_blade_layer_1"
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"animation": {
"interpolate": true,
"frametime": 3,
"frames": [0, 1, 2, 3, 4, 5, 6, 7, 8, 7, 6, 5, 4, 3, 2, 1]
"frametime": 1,
"frames": [0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 6, 7, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1
]
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"animation": {
"interpolate": true,
"frametime": 3,
"frames": [0, 1, 2, 3, 4, 5, 6, 7, 8, 7, 6, 5, 4, 3, 2, 1]
"frametime": 1,
"frames": [0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 6, 7, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1]
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"animation": {
"interpolate": true,
"frametime": 2,
"frames": [0, 1, 2, 3, 4, 5, 6, 7, 8, 7, 6, 5, 4, 3, 2, 1]
"frametime": 1,
"frames": [0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 4, 4, 5, 6, 7, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 2, 1, 1, 1]
}
}
Loading