Skip to content

Commit

Permalink
Update strings and items to 1.11
Browse files Browse the repository at this point in the history
Update all strings and vars to 1.11.
Add new items and blocks to items.py.
  • Loading branch information
Rycieos committed Nov 29, 2016
1 parent 23c00ea commit d92f00d
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ python:
- "2.7"
# - "3.2"
env:
- MC_VERSION=1.10
- MC_VERSION=1.11
before_install:
- wget https://raw.githubusercontent.com/python-pillow/Pillow/master/libImaging/Imaging.h
- wget https://raw.githubusercontent.com/python-pillow/Pillow/master/libImaging/ImPlatform.h
Expand Down
6 changes: 3 additions & 3 deletions docs/running.rst
Original file line number Diff line number Diff line change
Expand Up @@ -271,13 +271,13 @@ If you want or need to provide your own textures, you have several options:

::

VERSION=1.10
VERSION=1.11
wget https://s3.amazonaws.com/Minecraft.Download/versions/${VERSION}/${VERSION}.jar -P ~/.minecraft/versions/${VERSION}/

If that's too confusing for you, then just take this single line and paste it into
a terminal to get 1.10 textures::
a terminal to get 1.11 textures::

wget https://s3.amazonaws.com/Minecraft.Download/versions/1.10/1.10.jar -P ~/.minecraft/versions/1.10/
wget https://s3.amazonaws.com/Minecraft.Download/versions/1.11/1.11.jar -P ~/.minecraft/versions/1.11/

* You can also just run the launcher to install the client.

Expand Down
21 changes: 21 additions & 0 deletions overviewer_core/items.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,25 @@
214: 'Nether Wart Block',
215: 'Red Nether Brick',
216: 'Bone Block',
217: 'Structure Void',
218: 'Observer',
219: 'White Shulker Box',
220: 'Orange Shulker Box',
221: 'Magenta Shulker Box',
222: 'Light Blue Shulker Box',
223: 'Yellow Shulker Box',
224: 'Lime Shulker Box',
225: 'Pink Shulker Box',
226: 'Gray Shulker Box',
227: 'Light Gray Shulker Box',
228: 'Cyan Shulker Box',
229: 'Purple Shulker Box',
230: 'Blue Shulker Box',
231: 'Brown Shulker Box',
232: 'Green Shulker Box',
233: 'Red Shulker Box',
234: 'Black Shulker Box',
255: 'Structure Block',
256: 'Iron Shovel',
257: 'Iron Pickaxe',
258: 'Iron Axe',
Expand Down Expand Up @@ -328,6 +347,8 @@
420: 'Lead',
421: 'Name Tag',
422: 'Minecart with Command Block',
449: 'Totem of Undying',
450: 'Shulker Shell',
2256: 'C418 - 13 Music Disc',
2257: 'C418 - Cat Music Disc',
2258: 'C418 - blocks Music Disc',
Expand Down
2 changes: 1 addition & 1 deletion overviewer_core/textures.py
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ def search_dir(base):
if verbose: logging.info("Found %s in '%s'", filename, path)
return open(path, mode)

raise TextureException("Could not find the textures while searching for '{0}'. Try specifying the 'texturepath' option in your config file.\nSet it to the path to a Minecraft Resource pack.\nAlternately, install the Minecraft client (which includes textures)\nAlso see <http://docs.overviewer.org/en/latest/running/#installing-the-textures>\n(Remember, this version of Overviewer requires a 1.10-compatible resource pack)\n(Also note that I won't automatically use snapshots; you'll have to use the texturepath option to use a snapshot jar)".format(filename))
raise TextureException("Could not find the textures while searching for '{0}'. Try specifying the 'texturepath' option in your config file.\nSet it to the path to a Minecraft Resource pack.\nAlternately, install the Minecraft client (which includes textures)\nAlso see <http://docs.overviewer.org/en/latest/running/#installing-the-textures>\n(Remember, this version of Overviewer requires a 1.11-compatible resource pack)\n(Also note that I won't automatically use snapshots; you'll have to use the texturepath option to use a snapshot jar)".format(filename))

def load_image_texture(self, filename):
# Textures may be animated or in a different resolution than 16x16.
Expand Down

0 comments on commit d92f00d

Please sign in to comment.