Merge branch '0.9' into 0.10

This commit is contained in:
gentlegiantJGC 2022-05-01 10:46:59 +01:00
commit 9a3d29ba06
3 changed files with 11 additions and 9 deletions

View File

@ -8,7 +8,8 @@ on:
branches: branches:
- master - master
- main - main
- '*([0-9]).*([0-9])' - '[0-9]+.[0-9]+'
- '[0-9]+.[0-9]+.[0-9]+'
pull_request: pull_request:
jobs: jobs:

View File

@ -8,7 +8,8 @@ on:
branches: branches:
- master - master
- main - main
- '*([0-9]).*([0-9])' - '[0-9]+.[0-9]+'
- '[0-9]+.[0-9]+.[0-9]+'
pull_request: pull_request:
jobs: jobs:

View File

@ -1,9 +1,9 @@
# if the below doesn't work please find an alternative from here: https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ # if the below doesn't work please find an alternative from here: https://extras.wxpython.org/wxPython4/extras/linux/gtk3/
wxPython>=4.1 wxPython~=4.1
numpy numpy~=1.17
pyopengl pyopengl~=3.0
packaging packaging
amulet-core~=1.7.0 amulet-core~=1.7
amulet-nbt~=1.0.4 amulet-nbt~=1.1
pymctranslate~=1.1.0 pymctranslate~=1.1
minecraft-resource-pack~=1.2.0 minecraft-resource-pack~=1.2