Change: Use modified version of nml

OpenTTD/nml#320
OpenTTD/nml#306

.gitignore

@@ -1,9 +1,10 @@
-gfx
+.nmlcache/
+gopath/
+nml/
+gfx/
+sprites/
 *.grf
-gopath
 *.png
-!palette.png
-.nmlcache
-nmlc
 custom_tags.txt
-cns.nml
+cns.nml
+!palette.png

Makefile

@@ -1,6 +1,6 @@
 # dependencies
 GORENDER := ./gopath/bin/gorender --palette "vox/ttd_palette.json" -s 4 -overwrite
-NMLC := nmlc
+NMLC := nml/nmlc
 GCC := gcc
 MANIFEST := manifest.json
 TIME := $(shell date -u +%Y/%m/%d\ %H:%M:%S\ UTC)

install_dependencies.sh

@@ -6,6 +6,16 @@ export GOPATH=$PWD/gopath
 go install github.com/ahyangyi/gorender/cmd@daeb83b4
 mv gopath/bin/cmd gopath/bin/gorender
 
-# if you have grf-py installed you may want to use a venv
-
-pip3 install nml==0.7.5
+# nml requires python to run
+# here I merge two PRs to nml, #306 and #320
+git clone https://github.com/openttd/nml.git
+cd nml
+git config user.name "anonymous"
+git config user.email "[email protected]"
+git checkout 0.7.5
+git remote add pr_source https://github.com/glx22/nml
+git fetch pr_source layout_registers
+git merge -X theirs pr_source/layout_registers -m "Merge layout_registers"
+git fetch pr_source var6B
+git merge -X theirs pr_source/var6B -m "Merge var6B"
+rm -rf .git