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.

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

Jump to bottom

Azzurra 1.11 to 1.20.4 #39

Merged
merged 2 commits into from
Jul 8, 2024
Merged

Azzurra 1.11 to 1.20.4 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a71751
Feat Panorama & Copyright
VittoriaAlata Jan 28, 2024
bccca12
Fix Pre 1.20.2 Reintroducing #18
VittoriaAlata Jan 29, 2024
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
32,571 changes: 32,541 additions & 30 deletions assets/minecraft/lang/en_au.json
View file
Open in desktop

Large diffs are not rendered by default.

32,571 changes: 32,541 additions & 30 deletions assets/minecraft/lang/en_ca.json
View file
Open in desktop

Large diffs are not rendered by default.

32,571 changes: 32,541 additions & 30 deletions assets/minecraft/lang/en_gb.json
View file
Open in desktop

Large diffs are not rendered by default.

32,571 changes: 32,541 additions & 30 deletions assets/minecraft/lang/en_nz.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions assets/minecraft/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"menu.modded": " (Modded, §7Azzurra§r)",
"debug.prefix": "§r§3|Debug§r §7Azzurra v2.15.0§r >>",
"menu.modded": " (Modded, Azzurra§r)",
"debug.prefix": "§r§3|Debug§r Azzurra v2.15.0§r >>",
"title.multiplayer.other": "Multiplayer 3rd-party Server, Azzurra v2.15.0",
"title.credits": "§7Azzurra v2.15.0, §rCopyright Mojang AB. Do not distribute!",
"title.credits": "Azzurra v2.15.0, §rCopyright Mojang AB. Do not distribute!",
"title.multiplayer.lan": "Multiplayer (LAN), Azzurra v2.15.0",
"title.multiplayer.realms": "Multiplayer (Realms), Azzurra v2.15.0",
"title.singleplayer": "Singleplayer, Azzurra v2.15.0",
Expand Down
6 changes: 3 additions & 3 deletions assets/minecraft/lang/fr_ca.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"menu.modded": " (Moddée, §7Azzurra§r)",
"debug.prefix": "§r§3|Débogage§r §7Azzurra v2.15.0§r >>",
"menu.modded": " (Moddée, Azzurra§r)",
"debug.prefix": "§r§3|Débogage§r Azzurra v2.15.0§r >>",
"title.multiplayer.other": "Multijoueur (serveur tiers), Azzurra v2.15.0",
"title.credits": "§7Azzurra v2.15.0, §rCopyright Mojang AB. Ne pas distribuer !",
"title.credits": "Azzurra v2.15.0, §rCopyright Mojang AB. Ne pas distribuer !",
"title.multiplayer.lan": "Multijoueur (LAN), Azzurra v2.15.0",
"title.multiplayer.realms": "Multijoueur (Realms), Azzurra v2.15.0",
"title.singleplayer": "Solo, Azzurra v2.15.0",
Expand Down
6 changes: 3 additions & 3 deletions assets/minecraft/lang/fr_fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"menu.modded": " (Moddée, §7Azzurra§r)",
"debug.prefix": "§r§3|Débogage§r §7Azzurra v2.15.0§r >>",
"menu.modded": " (Moddée, Azzurra§r)",
"debug.prefix": "§r§3|Débogage§r Azzurra v2.15.0§r >>",
"title.multiplayer.other": "Multijoueur (serveur tiers), Azzurra v2.15.0",
"title.credits": "§7Azzurra v2.15.0, §rCopyright Mojang AB. Ne pas distribuer !",
"title.credits": "Azzurra v2.15.0, §rCopyright Mojang AB. Ne pas distribuer !",
"title.multiplayer.lan": "Multijoueur (LAN), Azzurra v2.15.0",
"title.multiplayer.realms": "Multijoueur (Realms), Azzurra v2.15.0",
"title.singleplayer": "Solo, Azzurra v2.15.0",
Expand Down
6 changes: 3 additions & 3 deletions assets/minecraft/lang/it_it.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"menu.modded": " (Moddato, §7Azzurra§r)",
"debug.prefix": "§r§3|Debug§r §7Azzurra v2.15.0§r >>",
"menu.modded": " (Moddato, Azzurra§r)",
"debug.prefix": "§r§3|Debug§r Azzurra v2.15.0§r >>",
"title.multiplayer.other": "Multigiocatore (server di terze parti), Azzurra v2.15.0",
"title.credits": "§7Azzurra v2.15.0, §rCopyright Mojang AB. Vietata la distribuzione!",
"title.credits": "Azzurra v2.15.0, §rCopyright Mojang AB. Vietata la distribuzione!",
"title.multiplayer.lan": "Multigiocatore (LAN), Azzurra v2.15.0",
"title.multiplayer.realms": "Multigiocatore (Realms), Azzurra v2.15.0",
"title.singleplayer": "Giocatore singolo, Azzurra v2.15.0",
Expand Down
6 changes: 3 additions & 3 deletions assets/minecraft/lang/ru_ru.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"menu.modded": "(Модифицировано, §7Аззурра§r)",
"debug.prefix": "§r§3|Debug§r §7Аззурра v2.15.0§r >>",
"menu.modded": "(Модифицировано, Аззурра§r)",
"debug.prefix": "§r§3|Debug§r Аззурра v2.15.0§r >>",
"title.multiplayer.other": "Сторонный многопользовательский сервер, Аззурра v2.15.0",
"title.credits": "§7Аззурра v2.15.0 ©, §r© Mojang AB. Не распространять!",
"title.credits": "Аззурра v2.15.0 ©, §r© Mojang AB. Не распространять!",
"title.multiplayer.lan": "Мультиплеер (LAN), Аззурра v2.15.0",
"title.multiplayer.realms": "Мультиплеер (Realms), Аззурра v2.15.0",
"title.singleplayer": "Одиночная игра, Аззурра v2.15.0",
Expand Down
6 changes: 3 additions & 3 deletions assets/minecraft/shaders/core/position_color.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ void main() {
ivec2 pixel = ivec2(gl_FragCoord.xy);
ivec2 offset = pixel - ivec2(10, 45);
if (offset.x >= 0 && offset.y >= 0 && offset.x < 622 && offset.y < 12) {
uint[] TEXT = uint[](_C, _O, _P, _Y, _R, _I, _G, _H, _T, _SPACE, _PARENL, _C, _PARENR, _SPACE, _2, _0, _2, _3, _SCORE, _2, _0, _2, _4, _SPACE, _V, _I, _T, _T, _O, _R, _I, _A, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE);
uint[] TEXT = uint[](_C, _O, _P, _Y, _R, _I, _G, _H, _T, _SPACE, _PARENL, _C, _PARENR, _SPACE, _2, _0, _2, _3, _SPACE, _V, _I, _T, _T, _O, _R, _I, _A, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE);
for (int i = 0; i < 52; i++) {
int startX = i * 12;
int endX = startX + 10;
Expand Down Expand Up @@ -73,7 +73,7 @@ void main() {
}
offset = pixel - ivec2(10, 85);
if (offset.x >= 0 && offset.y >= 0 && offset.x < 514 && offset.y < 12) {
uint[] TEXT = uint[]( _V, _2, _DOT, _1, _5, _DOT, _0, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE);
uint[] TEXT = uint[]( _V, _2, _DOT, _1, _6, _DOT, _0, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE);
for (int i = 0; i < 43; i++) {
int startX = i * 12;
int endX = startX + 10;
Expand All @@ -90,7 +90,7 @@ void main() {
}
offset = pixel - ivec2(10, 65);
if (offset.x >= 0 && offset.y >= 0 && offset.x < 514 && offset.y < 12) {
uint[] TEXT = uint[]( _2, _5, _DOT, _0, _1, _DOT, _2, _0, _2, _4, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE);
uint[] TEXT = uint[]( _2, _4, _DOT, _0, _2, _DOT, _2, _0, _2, _4, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE);
for (int i = 0; i < 43; i++) {
int startX = i * 12;
int endX = startX + 10;
Expand Down
6 changes: 3 additions & 3 deletions assets/minecraft/shaders/core/rendertype_gui.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ void main() {
ivec2 pixel = ivec2(gl_FragCoord.xy);
ivec2 offset = pixel - ivec2(10, 45);
if (offset.x >= 0 && offset.y >= 0 && offset.x < 622 && offset.y < 12) {
uint[] TEXT = uint[](_C, _O, _P, _Y, _R, _I, _G, _H, _T, _SPACE, _PARENL, _C, _PARENR, _SPACE, _2, _0, _2, _3, _SCORE, _2, _0, _2, _4, _SPACE, _V, _I, _T, _T, _O, _R, _I, _A, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE);
uint[] TEXT = uint[](_C, _O, _P, _Y, _R, _I, _G, _H, _T, _SPACE, _PARENL, _C, _PARENR, _SPACE, _2, _0, _2, _3, _SPACE, _V, _I, _T, _T, _O, _R, _I, _A, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE);
for (int i = 0; i < 52; i++) {
int startX = i * 12;
int endX = startX + 10;
Expand Down Expand Up @@ -73,7 +73,7 @@ void main() {
}
offset = pixel - ivec2(10, 85);
if (offset.x >= 0 && offset.y >= 0 && offset.x < 514 && offset.y < 12) {
uint[] TEXT = uint[]( _V, _2, _DOT, _1, _5, _DOT, _0, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE);
uint[] TEXT = uint[]( _V, _2, _DOT, _1, _6, _DOT, _0, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE);
for (int i = 0; i < 43; i++) {
int startX = i * 12;
int endX = startX + 10;
Expand All @@ -90,7 +90,7 @@ void main() {
}
offset = pixel - ivec2(10, 65);
if (offset.x >= 0 && offset.y >= 0 && offset.x < 514 && offset.y < 12) {
uint[] TEXT = uint[]( _2, _5, _DOT, _0, _1, _DOT, _2, _0, _2, _4, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE);
uint[] TEXT = uint[]( _2, _4, _DOT, _0, _2, _DOT, _2, _0, _2, _4, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE);
for (int i = 0; i < 43; i++) {
int startX = i * 12;
int endX = startX + 10;
Expand Down
Binary file modified assets/minecraft/textures/gui/icons.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/minecraft/textures/gui/title/background/panorama_overlay.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/minecraft/textures/gui/title/minecraft.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/minecraft/textures/gui/widgets.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed overlays/A/assets/minecraft/textures/gui/title/minecraft.png
View file
Open in desktop
Binary file not shown.
10 changes: 0 additions & 10 deletions overlays/A/pack.mcmeta
View file
Open in desktop

This file was deleted.

Binary file removed overlays/A/pack.png
View file
Open in desktop
Binary file not shown.
15 changes: 2 additions & 13 deletions pack.mcmeta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,9 @@
"min_inclusive": 3,
"max_inclusive": 24
},
"description": "§1Azzurra §6HQ Pack§r §8§o© Vittoria 2023-2024§r"
"description": "§1Azzurra §6HQ Pack§r §8§o© Vittoria 2023§r"
},
"overlays": {
"entries": [
{
"formats": {
"min_inclusive": 18,
"max_inclusive": 24
},
"directory": "A"
}
]
},
"sodium": {
"sodium": {
"ignored_shaders": [
"rendertype_solid.vsh",
"rendertype_translucent.vsh",
Expand Down
Loading