Merge branch 'last-fixes' into 'master'

1.4.2

See merge request Df458/rpg16!52

.cdb.json.template

@@ -4,6 +4,7 @@
 SHORT_DESCRIPTION
     "tags": [ "16px" ],
     "media_license": "CC-BY-SA-4.0",
+    "dev_state": "DEPRECATED",
     "repo": "https://gitlab.com/Df458/rpg16",
     "website": "https://www.huguesross.net",
     "issue_tracker": "https://gitlab.com/Df458/rpg16/issues",

CHANGELOG.md

@@ -1,3 +1,10 @@
+# v1.4.2
+- Fix keys appearance in Minetest Game
+- Mark support as ended
+- Deprecated support for the following mods:
+    - Ctf
+    - Repixture
+
 # v1.4.0
 - Add object crosshair texture
 - Add optimization pass to CI/CD pipeline

README.md

@@ -2,15 +2,16 @@
 A simple texturepack reminiscent of classic RPGs
 Created by [Hugues Alexandre Ross](https://huguesross.net)
 
+## Important Notice
+_RPG16 us no longer actively supported. Merge Requests to fix content may be accepted, as long as they meet the basic quality and style criteria. However, no further active development should be expected. Use of this texture pack is no longer recommended as support will gradually fail when supported mods/games are updated_
+
 ## Game Support
 The following games are supported:
 
-- Capture the Flag
 - Minetest Game
-- Repixture
 
 ## Mod Support
-In addition to the games, the following mods are supported:
+In addition to this game, the following mods are supported:
 
 - 3D Armor
 - Awards
@@ -35,8 +36,10 @@ In addition to the games, the following mods are supported:
 - Simple Shooter
 - [Stamina](https://content.minetest.net/packages/sofar/stamina/)
 
-**The following mods are deprecated. Textures from them remain for backwards-compatibility, but they no longer receive updates or support:**
+**The following mods/games are deprecated. Textures from them remain for backwards-compatibility, but they are no longer supported:**
 
+- (Game) Capture the Flag
+- (Game) Repixture
 - Baked Clay
 - Ethereal NG
 - Mobs Monster

ctf/clones.txt

@@ -1,4 +0,0 @@
-grenades_basic/grenades_basic_frag.png,grenades/grenades_frag.png
-grenades_basic/grenades_basic_smoke_grenade.png,grenades/grenades_smoke_grenade.png
-grenades_basic/grenades_basic_smoke.png,grenades/grenades_smoke.png
-grenades_basic/grenades_basic_boom.png,grenades/grenades_boom.png

export.sh

@@ -79,7 +79,7 @@ copyExport "texture_pack.conf"
 echo "Export textures..."
 # Copy images, converting any source files
 folderExport "3d_armor"
-folderExport "awards"
+folderExport "old/awards"
 folderExport "old/baked_clay"
 folderExport "basic_materials"
 folderExport "beds"
@@ -143,41 +143,41 @@ folderExport "xpanes"
 makeClones "grenades_basic/clones.txt"
 
 # CTF
-folderExport "ctf/ctf_bandages"
-folderExport "ctf/ctf_classes"
-folderExport "ctf/ctf_colors"
-folderExport "ctf/ctf_events"
-folderExport "ctf/ctf_flag"
-folderExport "ctf/ctf_map"
-folderExport "ctf/ctf_traps"
-folderExport "ctf/medkits"
-folderExport "ctf/sniper_rifles"
-mkdir "${EXPORT_DIR}/grenades" # Folder for CTF grenades
-makeClones "ctf/clones.txt"
+folderExport "old/ctf/ctf_bandages"
+folderExport "old/ctf/ctf_classes"
+folderExport "old/ctf/ctf_colors"
+folderExport "old/ctf/ctf_events"
+folderExport "old/ctf/ctf_flag"
+folderExport "old/ctf/ctf_map"
+folderExport "old/ctf/ctf_traps"
+folderExport "old/ctf/medkits"
+folderExport "old/ctf/sniper_rifles"
+mkdir -p "${EXPORT_DIR}/ctf/grenades" # Folder for CTF grenades
+makeClones "old/ctf/clones.txt"
 
 # Repixture
-folderExport "repixture/armor"
-folderExport "repixture/bed"
-folderExport "repixture/default"
-folderExport "repixture/door"
-folderExport "repixture/farming"
-folderExport "repixture/gold"
-folderExport "repixture/headbars"
-folderExport "repixture/hunger"
-folderExport "repixture/jewels"
-folderExport "repixture/locks"
-folderExport "repixture/lumien"
-folderExport "repixture/mobs"
-folderExport "repixture/music"
-folderExport "repixture/nav"
-folderExport "repixture/parachute"
-folderExport "repixture/partialblocks"
-folderExport "repixture/player_skins"
-folderExport "repixture/ui"
-folderExport "repixture/village"
-folderExport "repixture/weather"
-folderExport "repixture/wieldhand"
-makeAlphas "repixture/default/alphas.txt"
-makeClones "repixture-clones.txt"
+folderExport "old/repixture/armor"
+folderExport "old/repixture/bed"
+folderExport "old/repixture/default"
+folderExport "old/repixture/door"
+folderExport "old/repixture/farming"
+folderExport "old/repixture/gold"
+folderExport "old/repixture/headbars"
+folderExport "old/repixture/hunger"
+folderExport "old/repixture/jewels"
+folderExport "old/repixture/locks"
+folderExport "old/repixture/lumien"
+folderExport "old/repixture/mobs"
+folderExport "old/repixture/music"
+folderExport "old/repixture/nav"
+folderExport "old/repixture/parachute"
+folderExport "old/repixture/partialblocks"
+folderExport "old/repixture/player_skins"
+folderExport "old/repixture/ui"
+folderExport "old/repixture/village"
+folderExport "old/repixture/weather"
+folderExport "old/repixture/wieldhand"
+makeAlphas "old/repixture/default/alphas.txt"
+makeClones "old/repixture-clones.txt"
 
 echo "Done! Files copied to ${EXPORT_DIR}"

long_description.awk

@@ -8,7 +8,7 @@ BEGIN {
 }
 
 {
-    if (header_count > 1 && header_count < 5) {
+    if (header_count > 1 && header_count < 6) {
         if (long_description == "") {
             long_description = $0;
         } else {

old/ctf/clones.txt

@@ -0,0 +1,4 @@
+grenades_basic/grenades_basic_frag.png,ctf/grenades/grenades_frag.png
+grenades_basic/grenades_basic_smoke_grenade.png,ctf/grenades/grenades_smoke_grenade.png
+grenades_basic/grenades_basic_smoke.png,ctf/grenades/grenades_smoke.png
+grenades_basic/grenades_basic_boom.png,ctf/grenades/grenades_boom.png