Skip to content

Commit

Permalink
Merge branch '1.19.4' into 1.20.1
Browse files Browse the repository at this point in the history
# Conflicts:
#	common/src/main/java/immersive_paintings/client/gui/ImmersivePaintingScreen.java
#	forge/src/main/resources/META-INF/mods.toml
  • Loading branch information
Luke100000 committed Sep 20, 2023
2 parents 653b1c5 + c1be8e7 commit 45ad750
Show file tree
Hide file tree
Showing 124 changed files with 257 additions and 100 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Uploading, %s seconds left",
"immersive_paintings.drop": "Drop an image here, enter a file path or URL or select a screenshot to start.",
"immersive_paintings.graffiti_warning": "Image contains transparency, use a graffiti instead!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "Image is too large!",
"immersive_paintings.error.limit_reached": "You reached your maximum amount of uploaded paintings!",
"immersive_paintings.filter.all": "All",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Uploading, %s seconds left",
"immersive_paintings.drop": "Drop an image here, enter a file path or URL or select a screenshot to start.",
"immersive_paintings.graffiti_warning": "Image contains transparency, use a graffiti instead!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "Image is too large!",
"immersive_paintings.error.limit_reached": "You reached your maximum amount of uploaded paintings!",
"immersive_paintings.filter.all": "All",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Uploading, %s seconds left",
"immersive_paintings.drop": "Drop an image here, enter a file path or URL or select a screenshot to start.",
"immersive_paintings.graffiti_warning": "Image contains transparency, use a graffiti instead!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "Image is too large!",
"immersive_paintings.error.limit_reached": "You reached your maximum amount of uploaded paintings!",
"immersive_paintings.filter.all": "All",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Uploading, %s seconds left",
"immersive_paintings.drop": "Drop an image here, enter a file path or URL or select a screenshot to start.",
"immersive_paintings.graffiti_warning": "Image contains transparency, use a graffiti instead!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "Image is too large!",
"immersive_paintings.error.limit_reached": "You reached your maximum amount of uploaded paintings!",
"immersive_paintings.filter.all": "All",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Uploading, %s seconds left",
"immersive_paintings.drop": "Drop an image here, enter a file path or URL or select a screenshot to start.",
"immersive_paintings.graffiti_warning": "Image contains transparency, use a graffiti instead!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "Image is too large!",
"immersive_paintings.error.limit_reached": "You reached your maximum amount of uploaded paintings!",
"immersive_paintings.filter.all": "All",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Hochladen, %s Sekunden übrig",
"immersive_paintings.drop": "Lege hier ein Bild ab, gib einen Dateipfad oder eine URL ein oder wähle einen Screenshot aus, um zu starten.",
"immersive_paintings.graffiti_warning": "Das Bild enthält Transparenz, verwende stattdessen ein Graffiti!",
"immersive_paintings.error.no_permission": "Keine Erlaubnis!",
"immersive_paintings.error.too_large": "Das Bild ist zu groß!",
"immersive_paintings.error.limit_reached": "Du hast die maximale Anzahl an hochgeladenen Bildern erreicht!",
"immersive_paintings.filter.all": "Alle",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Загрузка, засталося %s секунд",
"immersive_paintings.drop": "Загрузіце карціну сюды, альбо ўвядзіце URL ці выберыце здымак экрану каб пачаць.",
"immersive_paintings.graffiti_warning": "Image contains transparency, use a graffiti instead!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "Файл занадта вялікі!",
"immersive_paintings.error.limit_reached": "Вы дасягнулі максімальнай колькасці загружаных карцін!",
"immersive_paintings.filter.all": "Усе",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Качване, остават %s секунди",
"immersive_paintings.drop": "Пуснете тук изображение, въведете път до файл или URL адрес или изберете снимка на екрана, за да започнете.",
"immersive_paintings.graffiti_warning": "Изображението съдържа прозрачност, вместо това използвайте графити!",
"immersive_paintings.error.no_permission": "Няма разрешение!",
"immersive_paintings.error.too_large": "Изображението е твърде голямо!",
"immersive_paintings.error.limit_reached": "Достигнали сте максималния брой качени картини!",
"immersive_paintings.filter.all": "Всички",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Uploading, %s seconds left",
"immersive_paintings.drop": "Drop an image here, enter a file path or URL or select a screenshot to start.",
"immersive_paintings.graffiti_warning": "Image contains transparency, use a graffiti instead!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "Image is too large!",
"immersive_paintings.error.limit_reached": "You reached your maximum amount of uploaded paintings!",
"immersive_paintings.filter.all": "All",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Uploaden, %s seconden over",
"immersive_paintings.drop": "Drop hier een afbeelding, voer een bestandspad of URL in of selecteer een screenshot om te beginnen.",
"immersive_paintings.graffiti_warning": "Afbeelding bevat transparantie, gebruik in plaats daarvan een graffiti!",
"immersive_paintings.error.no_permission": "Geen toestemming!",
"immersive_paintings.error.too_large": "Afbeelding is te groot!",
"immersive_paintings.error.limit_reached": "Je hebt je maximale aantal geüploade schilderijen bereikt!",
"immersive_paintings.filter.all": "Alle",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Uploading, %s seconds left",
"immersive_paintings.drop": "Drop an image here, enter a file path or URL or select a screenshot to start.",
"immersive_paintings.graffiti_warning": "Image contains transparency, use a graffiti instead!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "Image is too large!",
"immersive_paintings.error.limit_reached": "You reached your maximum amount of uploaded paintings!",
"immersive_paintings.filter.all": "All",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Uploading, %s seconds left",
"immersive_paintings.drop": "Drop an image here, enter a file path or URL or select a screenshot to start.",
"immersive_paintings.graffiti_warning": "Image contains transparency, use a graffiti instead!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "Image is too large!",
"immersive_paintings.error.limit_reached": "You reached your maximum amount of uploaded paintings!",
"immersive_paintings.filter.all": "All",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Nahrávání, zbývá %s sekund",
"immersive_paintings.drop": "Vložte sem obrázek, zadejte cestu k souboru nebo adresu URL nebo vyberte snímek obrazovky a začněte.",
"immersive_paintings.graffiti_warning": "Obrázek obsahuje průhlednost, použijte místo něj graffiti!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "Obrázek je příliš velký!",
"immersive_paintings.error.limit_reached": "Dosáhli jste maximálního počtu nahraných obrazů!",
"immersive_paintings.filter.all": "Všechny",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Uploading, %s seconds left",
"immersive_paintings.drop": "Drop an image here, enter a file path or URL or select a screenshot to start.",
"immersive_paintings.graffiti_warning": "Image contains transparency, use a graffiti instead!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "Image is too large!",
"immersive_paintings.error.limit_reached": "You reached your maximum amount of uploaded paintings!",
"immersive_paintings.filter.all": "All",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Uploading, %s sekunder tilbage",
"immersive_paintings.drop": "Smid et billede her, indtast en filsti eller URL, eller vælg et skærmbillede for at starte.",
"immersive_paintings.graffiti_warning": "Billedet indeholder gennemsigtighed, brug en graffiti i stedet!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "Billedet er for stort!",
"immersive_paintings.error.limit_reached": "Du har nået dit maksimale antal uploadede malerier!",
"immersive_paintings.filter.all": "Alle",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Hochladen, %s Sekunden übrig",
"immersive_paintings.drop": "Lege hier ein Bild ab, gib einen Dateipfad oder eine URL ein oder wähle einen Screenshot aus, um zu starten.",
"immersive_paintings.graffiti_warning": "Das Bild enthält Transparenz, verwende stattdessen ein Graffiti!",
"immersive_paintings.error.no_permission": "Keine Erlaubnis!",
"immersive_paintings.error.too_large": "Das Bild ist zu groß!",
"immersive_paintings.error.limit_reached": "Du hast die maximale Anzahl an hochgeladenen Bildern erreicht!",
"immersive_paintings.filter.all": "Alle",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Lade hoch, %s Sekunden verbleibend",
"immersive_paintings.drop": "Droppe ein Bild hier, gebe einen Dateinamen ein oder wähle einen Screenshot aus.",
"immersive_paintings.graffiti_warning": "Das Bild enthält Transparenz, verwende stattdessen ein Graffiti!",
"immersive_paintings.error.no_permission": "Keine Erlaubnis!",
"immersive_paintings.error.too_large": "Das Bild ist zu groß!",
"immersive_paintings.error.limit_reached": "Du hast die maximale Anzahl an Gemälden erreicht!",
"immersive_paintings.filter.all": "Alle",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Lade hoch, %s Sekunden verbleibend",
"immersive_paintings.drop": "Droppe ein Bild hier, gebe einen Dateinamen ein oder wähle einen Screenshot aus.",
"immersive_paintings.graffiti_warning": "Das Bild enthält Transparenz, verwende stattdessen ein Graffiti!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "Das Bild ist zu groß!",
"immersive_paintings.error.limit_reached": "Du hast die maximale Anzahl an Gemälden erreicht!",
"immersive_paintings.filter.all": "Alle",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Ανέβασμα, %s δευτερόλεπτα αριστερά",
"immersive_paintings.drop": "Αφήστε μια εικόνα εδώ, εισαγάγετε μια διαδρομή αρχείου ή μια διεύθυνση URL ή επιλέξτε ένα στιγμιότυπο οθόνης για να ξεκινήσετε.",
"immersive_paintings.graffiti_warning": "Η εικόνα περιέχει διαφάνεια, χρησιμοποιήστε ένα γκράφιτι!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "Η εικόνα είναι πολύ μεγάλη!",
"immersive_paintings.error.limit_reached": "Φτάσατε στο μέγιστο αριθμό ανεβασμένων πινάκων!",
"immersive_paintings.filter.all": "Όλα",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Uploading, %s seconds left",
"immersive_paintings.drop": "Drop an image here, enter a file path or URL or select a screenshot to start.",
"immersive_paintings.graffiti_warning": "Image contains transparency, use a graffiti instead!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "Image is too large!",
"immersive_paintings.error.limit_reached": "You reached your maximum amount of uploaded paintings!",
"immersive_paintings.filter.all": "All",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Uploading, %s seconds left",
"immersive_paintings.drop": "Drop an image here, enter a file path or URL or select a screenshot to start.",
"immersive_paintings.graffiti_warning": "Image contains transparency, use a graffiti instead!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "Image is too large!",
"immersive_paintings.error.limit_reached": "You reached your maximum amount of uploaded paintings!",
"immersive_paintings.filter.all": "All",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Uploading, %s seconds left",
"immersive_paintings.drop": "Drop an image here, enter a file path or URL or select a screenshot to start.",
"immersive_paintings.graffiti_warning": "Image contains transparency, use a graffiti instead!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "Image is too large!",
"immersive_paintings.error.limit_reached": "You reached your maximum amount of uploaded paintings!",
"immersive_paintings.filter.all": "All",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Uploading, %s seconds left",
"immersive_paintings.drop": "Drop an image here, enter a file path or URL or select a screenshot to start.",
"immersive_paintings.graffiti_warning": "Image contains transparency, use a graffiti instead!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "Image is too large!",
"immersive_paintings.error.limit_reached": "You reached your maximum amount of uploaded paintings!",
"immersive_paintings.filter.all": "All",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Uploading, %s seconds left",
"immersive_paintings.drop": "Drop an image here, enter a file path or URL or select a screenshot to start.",
"immersive_paintings.graffiti_warning": "Image contains transparency, use a graffiti instead!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "Image is too large!",
"immersive_paintings.error.limit_reached": "You reached your maximum amount of uploaded paintings!",
"immersive_paintings.filter.all": "All",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Uploading, %s seconds left",
"immersive_paintings.drop": "Drop an image here, enter a file path or URL or select a screenshot to start.",
"immersive_paintings.graffiti_warning": "Image contains transparency, use a graffiti instead!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "Image is too large!",
"immersive_paintings.error.limit_reached": "You reached your maximum amount of uploaded paintings!",
"immersive_paintings.filter.all": "All",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Uploading, %s seconds left",
"immersive_paintings.drop": "Drop an image here, enter a file path or URL or select a screenshot to start.",
"immersive_paintings.graffiti_warning": "Image contains transparency, use a graffiti instead!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "Image is too large!",
"immersive_paintings.error.limit_reached": "You reached your maximum amount of uploaded paintings!",
"immersive_paintings.filter.all": "All",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Uploading, %s seconds left",
"immersive_paintings.drop": "Drop an image here, enter a file path or URL or select a screenshot to start.",
"immersive_paintings.graffiti_warning": "Image contains transparency, use a graffiti instead!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "Image is too large!",
"immersive_paintings.error.limit_reached": "You reached your maximum amount of uploaded paintings!",
"immersive_paintings.filter.all": "All",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Uploading, %s seconds left",
"immersive_paintings.drop": "Drop an image here, enter a file path or URL or select a screenshot to start.",
"immersive_paintings.graffiti_warning": "Image contains transparency, use a graffiti instead!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "Image is too large!",
"immersive_paintings.error.limit_reached": "You reached your maximum amount of uploaded paintings!",
"immersive_paintings.filter.all": "All",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Cargando, quedan %s segundos",
"immersive_paintings.drop": "Suelta una imagen aquí, introduce una ruta de archivo o URL o selecciona una captura de pantalla para empezar.",
"immersive_paintings.graffiti_warning": "La imagen contiene transparencia, ¡utiliza un grafiti en su lugar!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "¡La imagen es demasiado grande!",
"immersive_paintings.error.limit_reached": "¡Has alcanzado la cantidad máxima de cuadros subidos!",
"immersive_paintings.filter.all": "Todos",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Cargando, quedan %s segundos",
"immersive_paintings.drop": "Suelta una imagen aquí, introduce una ruta de archivo o URL o selecciona una captura de pantalla para empezar.",
"immersive_paintings.graffiti_warning": "La imagen contiene transparencia, ¡utiliza un grafiti en su lugar!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "¡La imagen es demasiado grande!",
"immersive_paintings.error.limit_reached": "¡Has alcanzado la cantidad máxima de cuadros subidos!",
"immersive_paintings.filter.all": "Todos",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Cargando, quedan %s segundos",
"immersive_paintings.drop": "Suelta una imagen aquí, introduce una ruta de archivo o URL o selecciona una captura de pantalla para empezar.",
"immersive_paintings.graffiti_warning": "La imagen contiene transparencia, ¡utiliza un grafiti en su lugar!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "¡La imagen es demasiado grande!",
"immersive_paintings.error.limit_reached": "¡Has alcanzado la cantidad máxima de cuadros subidos!",
"immersive_paintings.filter.all": "Todos",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Subiendo, %s segundos restantes",
"immersive_paintings.drop": "Arrastra una imagen aquí, introduce una ruta de archivo, URL o selecciona una captura de pantalla para comenzar.",
"immersive_paintings.graffiti_warning": "La imagen contiene transparencia, ¡utiliza un grafiti en su lugar!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "¡La imagen es demasiado grande!",
"immersive_paintings.error.limit_reached": "¡Has alcanzado la cantidad máxima de pinturas subidas!",
"immersive_paintings.filter.all": "Todo",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"immersive_paintings.upload": "Cargando, quedan %s segundos",
"immersive_paintings.drop": "Suelta una imagen aquí, introduce una ruta de archivo o URL o selecciona una captura de pantalla para empezar.",
"immersive_paintings.graffiti_warning": "La imagen contiene transparencia, ¡utiliza un grafiti en su lugar!",
"immersive_paintings.error.no_permission": "No permission!",
"immersive_paintings.error.too_large": "¡La imagen es demasiado grande!",
"immersive_paintings.error.limit_reached": "¡Has alcanzado la cantidad máxima de cuadros subidos!",
"immersive_paintings.filter.all": "Todos",
Expand Down
Loading

0 comments on commit 45ad750

Please sign in to comment.