Merge branch 'master' into japanese-names

README.md

@@ -140,9 +140,12 @@ This will produce 4 executable bin files inside the `build/bin` directory, and a
 ## TODO
 
 - Short-term
+  - [ ] Import japanese names from data/pokemon.json
+- Longer-term
+
+- Completed
   - [x] Fix bad whitespace stripping when building assets
   - [x] List all names
-- Longer-term
   - [x] Make data structure to hold categories, names and pokemon
   - [x] Increase speed
   - [x] Improve categories to be more specific than shiny/regular

build/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.18
+FROM golang:1.19
 
 WORKDIR /usr/local/src
 
@@ -27,7 +27,8 @@ RUN go run /usr/local/src/src/bin/convert/png_convert.go \
         -from /tmp/original/pokesprite/ \
         -to /tmp/cows/ \
         -padding 4 \
-        -skip '["resources/", "misc/", "icons/", "items/", "items-outline/"]' \
+        -skip '["resources/", "misc/", "icons/", "items/", "items-outline/", "pokemon-gen7x/"]' \
+    && mv /tmp/cows/pokemon-gen8/* /tmp/cows && rmdir /tmp/cows/pokemon-gen8/ \
     && cat /tmp/original/pokesprite/data/pokemon.json | jq -c .[] > /tmp/cows/pokemon.json \
     && rm -rf /tmp/original/pokesprite