From 05353d5b42547e2776288c74c1497a41b956a1f3 Mon Sep 17 00:00:00 2001
From: poikilos <7557867+poikilos@users.noreply.github.com>
Date: Wed, 19 Feb 2020 11:50:30 -0500
Subject: [PATCH] update docs to reflect nftools change; add upstream file

---
 .../mods/coderbuild/nftools/oldcoder.txt         |  15 ++++++++++-----
 .../nftools/textures/nftools_sunflower.png       | Bin 0 -> 365 bytes
 2 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 patches/deprecated/merged-upstream/Bucket_Game/mods/coderbuild/nftools/textures/nftools_sunflower.png

diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/coderbuild/nftools/oldcoder.txt b/patches/deprecated/merged-upstream/Bucket_Game/mods/coderbuild/nftools/oldcoder.txt
index 9839754..48d9c81 100644
--- a/patches/deprecated/merged-upstream/Bucket_Game/mods/coderbuild/nftools/oldcoder.txt
+++ b/patches/deprecated/merged-upstream/Bucket_Game/mods/coderbuild/nftools/oldcoder.txt
@@ -36,11 +36,16 @@ Poikilos  has  made  changes  designed to  make  "nftools"  complement
   (change nftools_*ore.png to nftools_mineral_*.png,
   nftools:*_ore to nftools:stone_with_*,
   nftools:amber to nftools:stone_with_amber)
-* The old minerals, converted:
-  `nftools:amethyst, nftools:black_opal`
-  `nftools:alexandrite_ore, nftools:bismuth`
-  `nftools:aquamarine, nftools:turquoise`
-  (for aliases see nftools_legacy in EnlivenMinetest)
+* The old minerals, converted
+  (* = requires EnlivenMinetest/patches/mods-stopgap/nftools_legacy now):
+  - * `minetest.register_alias("nftools:alexandrite_ore", "nftools:stone_with_bismuth")`
+  - * `minetest.register_alias("nftools:alexandrite", "nftools:bismuth")`
+  - `minetest.register_alias("nftools:amber", "nftools:stone_with_amber")  -- merged with Bucket_Game`
+    (formerly called amber but dropped chip; use conventions instead)
+  - * `minetest.register_alias("nftools:aquamarine_ore", "nftools:stone_with_turquoise")`
+  - * `minetest.register_alias("nftools:aquamarine", "nftools:turquoise")`
+  - `minetest.register_alias("nftools:amethyst_ore", "nftools:stone_with_blackopal")  -- merged with Bucket_Game`
+  - * `minetest.register_alias("nftools:amethyst", "nftools:blackopal")`
 
 Other changes:
 
diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/coderbuild/nftools/textures/nftools_sunflower.png b/patches/deprecated/merged-upstream/Bucket_Game/mods/coderbuild/nftools/textures/nftools_sunflower.png
new file mode 100644
index 0000000000000000000000000000000000000000..51e046250afe9b7842ebe9b2f453addb9f919626
GIT binary patch
literal 365
zcmV-z0h0cSP)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0000pP)t-s0000g
zGYdXV5K3ATO-%q&T?|!a5msgqS#B3*W&oK~0H&q@%y0nA%mC)*0RM{s|Nj65Y%4wh
z0004WQchC<K<3zH0002!Nkl<ZILoz>+m6E^3`EVPEJJ|s|6jWvr>Yu~CVkj-WC=0$
z!Jddrk#kDS={iE9fTu^wi8;xmqhUlntD2bay2%|&hcePnip*WVY0y*##r+H$zOEHb
z>+FeX2KKL|mQ@)eQryoF8&FHsuW}ONrx~<yt)-MogwTb(1?cTXK#R0t@@U{S!$QJi
zc2V!2Tc8in1UVpJJ}f|#lL9fVTfdw=VT=vWe{mSn82p#p>c=(zDxAi(?)^oHb0OrM
zwdRBFeb5q@!)b-mwK+Kdp@Mktg0nb9+!5|)*dUi%-23o_lm8jNkc$e2MX?iR00000
LNkvXXu0mjfXQ!J~

literal 0
HcmV?d00001