Skip to content

1.21.11 fixes #26

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.

Sign up for GitHub

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

Open
spytaspund wants to merge 5 commits into
base: main
Choose a base branch
from
Open

1.21.11 fixes #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a7a96f0
MegaMerge 1
spytaspund Sep 18, 2023
f47b6d1
Merge branch '1Bitlog-organization:main' into main
spytaspund Jun 16, 2026
77ab3f9
1.21.11 fixes
Jun 16, 2026
d61064d
More 1.21.11 fixes
Jun 18, 2026
e7f0ee3
Migrating to Custom Model Data, alpha stage, do not use, backup purpo…
Jun 19, 2026
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
Binary file removed assets/icons/textures/menu/main_menu.png
View file
Open in desktop
Binary file not shown.
Binary file removed assets/icons/textures/menu/options.png
View file
Open in desktop
Binary file not shown.
Binary file removed assets/icons/textures/splash/1bitlogver.psd
View file
Open in desktop
Binary file not shown.
Binary file removed assets/icons/textures/splash/sus.png
View file
Open in desktop
Binary file not shown.
29 changes: 10 additions & 19 deletions assets/minecraft/font/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,22 @@
{
"providers": [
{
"type":"bitmap",
"file":"icons:menu/main_menu.png",
"ascent":13,
"height":20,
"chars":[
"\uDB80\uDC00\uDB80\uDC01\uDB80\uDC02\uDB80\uDC03\uDB80\uDC04"
]
},
{
"type":"bitmap",
"file":"icons:menu/options.png",
"ascent":13,
"height":20,
"chars":[
"\uDB80\uDC08\uDB80\uDC09\uDB80\uDC0A\uDB80\uDC0B\uDB80\uDC0C\uDB80\uDC0D\uDB80\uDC0E\uDB80\uDC0F\uDB80\uDC10\uDB80\uDC11\uDB80\uDC12\uDB80\uDC13"
]
},
{
"type": "bitmap",
"file": "icons:splash/1bitlog.png",
"file": "minecraft:custom/gui/1bitlog.png",
"ascent": 8,
"height": 9,
"chars": [
"\u0195"
]
},
{
"type":"bitmap",
"file":"minecraft:gui/coal-generator/generator.png",
"ascent":13,
"height":165,
"chars":[
"\u0D3F"
]
}
]
}
6,611 changes: 3,297 additions & 3,314 deletions assets/minecraft/lang/ru_ru.json
View file
Open in desktop

Large diffs are not rendered by default.

58 changes: 58 additions & 0 deletions assets/minecraft/models/custom/cpu/2460v10-box.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"credit": "Made with Blockbench",
"texture_size": [64, 64],
"textures": {
"0": "custom/cpu/blue-2460v10/main-texture",
"particle": "custom/cpu/blue-2460v10/main-texture"
},
"elements": [
{
"from": [0, 0, 3],
"to": [16, 18, 13],
"faces": {
"north": {"uv": [0, 0, 4, 4.5], "texture": "#0"},
"east": {"uv": [0, 4.5, 2.5, 9], "texture": "#0"},
"south": {"uv": [4, 0, 8, 4.5], "texture": "#0"},
"west": {"uv": [2.5, 4.5, 5, 9], "texture": "#0"},
"up": {"uv": [9, 7, 5, 4.5], "texture": "#0"},
"down": {"uv": [9, 7, 5, 9.5], "texture": "#0"}
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [0, 90, -90],
"translation": [0, -2, -2],
"scale": [0.25, 0.25, 0.25]
},
"thirdperson_lefthand": {
"rotation": [0, 90, -90],
"translation": [0, -2, -2],
"scale": [0.25, 0.25, 0.25]
},
"firstperson_righthand": {
"rotation": [0, 125, 0],
"scale": [0.5, 0.5, 0.5]
},
"firstperson_lefthand": {
"rotation": [0, 125, 0],
"scale": [0.5, 0.5, 0.5]
},
"ground": {
"scale": [0.5, 0.5, 0.5]
},
"gui": {
"rotation": [-164.75, -42.36, 179.29],
"translation": [0, -0.5, 0],
"scale": [0.7, 0.7, 0.7]
},
"head": {
"rotation": [0, -180, 0],
"translation": [0, 0, 1.5]
},
"fixed": {
"translation": [0, 0, 3],
"scale": [0.75, 0.75, 0.75]
}
}
}
74 changes: 74 additions & 0 deletions assets/minecraft/models/custom/cpu/2460v10.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"credit": "Made with Blockbench",
"texture_size": [32, 32],
"textures": {
"0": "custom/cpu/blue-2460v10/pcb-texture",
"1": "custom/cpu/blue-2460v10/coolingbox-texture",
"particle": "custom/cpu/blue-2460v10/pcb-texture"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 0.5, 16],
"faces": {
"north": {"uv": [8, 0, 16, 0.25], "texture": "#0"},
"east": {"uv": [8, 0.5, 16, 0.75], "texture": "#0"},
"south": {"uv": [8, 1, 16, 1.25], "texture": "#0"},
"west": {"uv": [8, 1.5, 16, 1.75], "texture": "#0"},
"up": {"uv": [8, 8, 0, 0], "texture": "#0"},
"down": {"uv": [8, 8, 0, 16], "texture": "#0"}
}
},
{
"from": [1, 0.5, 1],
"to": [15, 1, 15],
"faces": {
"north": {"uv": [7, 0, 14, 0.25], "texture": "#1"},
"east": {"uv": [7, 0.5, 14, 0.75], "texture": "#1"},
"south": {"uv": [7, 1, 14, 1.25], "texture": "#1"},
"west": {"uv": [7, 1.5, 14, 1.75], "texture": "#1"},
"up": {"uv": [7.75, 7, 0, 0], "texture": "#1"},
"down": {"uv": [7, 7, 0, 14], "texture": "#1"}
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [90, -180, 0],
"translation": [0, 2, 2],
"scale": [0.25, 0.25, 0.25]
},
"thirdperson_lefthand": {
"rotation": [90, -180, 0],
"translation": [0, 2, 2],
"scale": [0.25, 0.25, 0.25]
},
"firstperson_righthand": {
"rotation": [60, -170, 0],
"translation": [3, 2.5, 2.5],
"scale": [0.5, 0.5, 0.5]
},
"firstperson_lefthand": {
"rotation": [60, -170, 0],
"translation": [3, 2.5, 2.5],
"scale": [0.5, 0.5, 0.5]
},
"ground": {
"rotation": [-90, 0, 0],
"translation": [0, 0.25, -3.75],
"scale": [0.5, 0.5, 0.5]
},
"gui": {
"rotation": [90, -180, 0],
"scale": [0.75, 0.75, 0.75]
},
"head": {
"rotation": [-90, 0, 0],
"translation": [0, 0, -13.5]
},
"fixed": {
"rotation": [-90, 0, 0],
"translation": [0, 0, -7.75]
}
}
}
56 changes: 56 additions & 0 deletions assets/minecraft/models/custom/cpu/4800-box.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"credit": "Made with Blockbench",
"texture_size": [64, 64],
"textures": {
"1": "./ryazan-4800/main-texture"
},
"elements": [
{
"from": [2, 0, 0],
"to": [14, 16, 16],
"faces": {
"north": {"uv": [4, 0, 7, 4], "texture": "#1"},
"east": {"uv": [0, 0, 4, 4], "texture": "#1"},
"south": {"uv": [4, 4, 7, 8], "texture": "#1"},
"west": {"uv": [0, 4, 4, 8], "texture": "#1"},
"up": {"uv": [10, 0, 7, 4], "texture": "#1"},
"down": {"uv": [10, 4, 7, 8], "texture": "#1"}
}
}
],
"display": {
"thirdperson_righthand": {
"translation": [0, 2, 1.75],
"scale": [0.25, 0.25, 0.25]
},
"thirdperson_lefthand": {
"translation": [0, 2, 1.75],
"scale": [0.25, 0.25, 0.25]
},
"firstperson_righthand": {
"rotation": [-135, 180, 163],
"translation": [-0.75, 1.75, 0],
"scale": [0.5, 0.5, 0.5]
},
"firstperson_lefthand": {
"rotation": [-60, 70.01, 36],
"translation": [-0.75, 1.75, 0],
"scale": [0.5, 0.5, 0.5]
},
"ground": {
"scale": [0.5, 0.5, 0.5]
},
"gui": {
"rotation": [24.25, 129, 0],
"scale": [0.65, 0.65, 0.65]
},
"head": {
"rotation": [-180, 90, -180]
},
"fixed": {
"rotation": [0, -90, 0],
"translation": [0, 0, 3],
"scale": [0.5, 0.5, 0.5]
}
}
}
74 changes: 74 additions & 0 deletions assets/minecraft/models/custom/cpu/4800.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"credit": "Made with Blockbench",
"texture_size": [32, 32],
"textures": {
"0": "custom/cpu/ryazan-4800/pcb-texture",
"1": "custom/cpu/ryazan-4800/coolingbox-texture",
"particle": "custom/cpu/ryazan-4800/pcb-texture"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 0.5, 16],
"faces": {
"north": {"uv": [8, 1, 16, 1.5], "texture": "#0"},
"east": {"uv": [8, 1.5, 16, 2], "texture": "#0"},
"south": {"uv": [8, 0, 16, 0.5], "texture": "#0"},
"west": {"uv": [8, 0.5, 16, 1], "texture": "#0"},
"up": {"uv": [8, 8, 0, 0], "rotation": 180, "texture": "#0"},
"down": {"uv": [8, 8, 0, 16], "rotation": 180, "texture": "#0"}
}
},
{
"from": [1, 0.5, 1],
"to": [15, 1, 15],
"faces": {
"north": {"uv": [7, 0.5, 14, 0.75], "texture": "#1"},
"east": {"uv": [7, 1, 14, 1.25], "texture": "#1"},
"south": {"uv": [7, 1.5, 14, 1.75], "texture": "#1"},
"west": {"uv": [7, 0, 14, 0.25], "texture": "#1"},
"up": {"uv": [7, 7, 0, 0], "rotation": 270, "texture": "#1"},
"down": {"uv": [7, 7, 0, 14], "rotation": 90, "texture": "#1"}
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [90, -180, 0],
"translation": [0, 2, 2],
"scale": [0.25, 0.25, 0.25]
},
"thirdperson_lefthand": {
"rotation": [90, -180, 0],
"translation": [0, 2, 2],
"scale": [0.25, 0.25, 0.25]
},
"firstperson_righthand": {
"rotation": [60, -170, 0],
"translation": [3, 2.5, 2.5],
"scale": [0.5, 0.5, 0.5]
},
"firstperson_lefthand": {
"rotation": [60, -170, 0],
"translation": [3, 2.5, 2.5],
"scale": [0.5, 0.5, 0.5]
},
"ground": {
"rotation": [-90, 0, 0],
"translation": [0, 0.25, -3.75],
"scale": [0.5, 0.5, 0.5]
},
"gui": {
"rotation": [90, -180, 0],
"scale": [0.75, 0.75, 0.75]
},
"head": {
"rotation": [-90, 0, 0],
"translation": [0, 0, -13.5]
},
"fixed": {
"rotation": [-90, 0, 0],
"translation": [0, 0, -7.75]
}
}
}
55 changes: 55 additions & 0 deletions assets/minecraft/models/custom/cpu/6840-box.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"credit": "Made with Blockbench",
"texture_size": [64, 64],
"textures": {
"1": "./ryazan-6840/main-texture"
},
"elements": [
{
"from": [2, 0, 0],
"to": [14, 16, 16],
"faces": {
"north": {"uv": [4, 0, 7, 4], "texture": "#1"},
"east": {"uv": [0, 0, 4, 4], "texture": "#1"},
"south": {"uv": [4, 4, 7, 8], "texture": "#1"},
"west": {"uv": [0, 4, 4, 8], "texture": "#1"},
"up": {"uv": [10, 4, 7, 0], "texture": "#1"},
"down": {"uv": [10, 4, 7, 8], "texture": "#1"}
}
}
],
"display": {
"thirdperson_righthand": {
"translation": [0, -2, -2],
"scale": [0.25, 0.25, 0.25]
},
"thirdperson_lefthand": {
"translation": [0, -2, -2],
"scale": [0.25, 0.25, 0.25]
},
"firstperson_righthand": {
"rotation": [-25, 17.25, 0],
"scale": [0.5, 0.5, 0.5]
},
"firstperson_lefthand": {
"rotation": [-160, -25, -160],
"translation": [0, 0, 1.25],
"scale": [0.5, 0.5, 0.5]
},
"ground": {
"scale": [0.5, 0.5, 0.5]
},
"gui": {
"rotation": [24.25, 138, 0],
"scale": [0.65, 0.65, 0.65]
},
"head": {
"rotation": [-180, 90, -180],
"translation": [0, -0.5, 0.5]
},
"fixed": {
"rotation": [0, -90, 0],
"translation": [0, 0, 3]
}
}
}
Loading