0
Commit Graph

1102 Commits

Author SHA1 Message Date
rymate1234
c6922386a5 Use sys.exit(1) to exit rather than throwing a ValueError 2018-03-12 23:47:50 +00:00
rymate1234
80cc71325e Throw an error if the overviewer is running on a world saved on versions of Minecraft newer than snapshot 17w47a 2018-03-12 23:43:07 +00:00
Kevin Chang
e996bd1e47 fix pillow no longer allowing RGBA JPEG 2018-02-22 15:38:29 -08:00
Aaron Griffith
22b9ab3f63 Merge many branches into master.
Branches:
 * mioux/sensor-false #1359
 * bobfrankly/Terracotta_Texture_Fix #1408
 * bobfrankly/Documentation #1407
 * lyknode/fix-slime-algo #1400
 * 3decibels/uuidcache_expire #1359
2017-08-24 18:22:35 -04:00
Sylvain Rumeu
9cf068973d Removing deprecated option in index.html : ?sensor=false 2017-08-24 18:19:58 -04:00
BobFrankly
16d8845eb6 Terracotta texture rotation fix
Terracotta blocks have differing rotations on each side, necessitating different handling for each directional map render. This fix was aligned against "Light Grey Glazed Terracotta", I'm presuming the rest of the colors follow.
2017-08-24 06:51:46 -07:00
lyknode
d36414b1bf Fix slime algo by using integer for chunk coordinates. 2017-07-16 11:48:52 +02:00
Nicolas F
4b75f7fa63 Merge branch 'snapshot' 2017-06-09 18:08:38 +02:00
Nicolas F
711488e07d textures.py: Fix beds for 1.12
Bed textures are now one unified texture, so some cropping and
fiddling needs to be done.

Bed colours not yet implemented.
2017-06-09 18:06:29 +02:00
Nicolas F
461f8647e0 Update strings to 1.12 2017-06-09 16:28:49 +02:00
3decibels
e5b90fd512 Added expiration of uuidcache entries
Entries in the uuidcache will now be considered expired if they were
retrieved before the mtime of the player dat file. This follows the
recommendation made in issue #1279.
2017-06-05 18:29:43 +00:00
Nicolas F
dd96d95b66 settingsValidators: clean up checkBadEscapes
A side-effect of these changes is that \a no longer gets shown as
'\a', but '\0x07'. Some characters, i.e. \n and \t, are still shown
as '\n' and '\t' respectively, so this comes simply down to repr()
behaviour.

However, I do believe it's worth it to get rid of that ugly code
duplication.
2017-03-24 18:29:15 +01:00
Nicolas F
8cf47935e4 Remove unused imports 2017-03-24 17:57:37 +01:00
Nicolas F
99b223fb5a Merge pull request #1356 from overviewer/python2
Replace `python` with `python2`
2017-03-17 16:54:25 +01:00
Nicolas F
cd0eb2d5c4 genpoi: query fs caps before using FileReplacer
Probably fixes #1271
2017-03-17 14:57:22 +01:00
Nicolas F
94d6772266 rcon: code style fixes 2017-03-16 18:25:55 +01:00
Nicolas F
3551518bbd logger: reduce pillow verbosity
With newer pillow versions, pillow would create debug log lines for
every single PNG images it touches, so that spams the log in
Overviewer's verbose mode quite a bit.
2017-03-16 17:03:06 +01:00
Nicolas F
d2976625b3 world: remove redundant hashing
This is probably a leftover from the memcached thing. There is no
need to hash a key to be used for hashmap access, as the hashmap
itself hashes it already, and probably with a hash more appropriate
for the situation.
2017-03-16 16:26:10 +01:00
Nicolas F
4770af93f7 optimizeimages: add oxipng support 2017-03-16 15:50:02 +01:00
Nicolas F
5c44084332 optimizeimages: code style fixes
Now PEP8 compliant!
2017-03-16 14:58:41 +01:00
Nicolas F
f1909e9684 Remove memcached support
Apparently we had memcached support. It was never worth it, and put
a weird md5 hash calculation in the path of regular caching. Seeing
as it was completely undocumented, I doubt anyone has ever used it.
2017-03-16 14:45:19 +01:00
Nicolas F
8e883f47f5 Add support for concrete powder
aheadley is a pleb, and I can call him names in this commit message
because he doesn't look at them anyway lol
2017-03-10 07:35:39 +01:00
Nicolas F
d76a22e020 Fix deprecated NumPy API warnings 2017-03-09 17:28:18 +01:00
Nicolas F
13d5fb7642 Add terracotta and concrete blocks
Fixes #1367
2017-03-09 16:51:17 +01:00
Andrew Chin
6f237179e4 Allow debug import 2017-02-12 12:47:47 -05:00
Andrew Chin
884f8548e7 Work on windows build with gitlab CI 2017-02-12 12:47:47 -05:00
Andrew Chin
faa8d8f75c Replace python with python2
A continuation of c7d86eca76
2016-12-24 14:43:52 -05:00
Thomas Lake
1803178bc8 Need to catch CorruptNBTError in both paths 2016-12-20 12:23:41 +00:00
Andrew Chin
3938d1889c Better error handling of errors when a world fails to open.
A common case is a corrupt (or empty) level.dat file.  This condition
wasn't properly caught, yielding a less-than-useful stack trace.  Even
more concerning is that this could happen when a user is just running
"overviewer.py" to get a world listing.

This has been fixed to improve the user experience
2016-12-19 10:50:01 -05:00
Nicolas F
6ea2758c31 optimizeimages: support pngnq-s9
pngnq-s9 is essentially just a more recently dead version of pngnq,
however, due to not being able to specify multiple binary names in
the past, we've not supported it. Refactor the code to allow specifying
multiple binary names, and add pngnq-s9 to it.
2016-12-06 16:11:45 +01:00
Nicolas F
c49990f18b genPOI: expose uuid value for filter functions
Fixes #1345.
2016-12-06 15:28:53 +01:00
Nicolas F
54b93754c7 genPOI/docs: Handle new sign id values
Minecraft now uses minecraft:sign as its id for signs, but also uses
Sign for older versions or chunks that have not yet been updated.

Change the genPOI sign wrangling code and the documentation to reflect
this change.

Fixes #1340.
2016-12-06 15:17:39 +01:00
Nicolas F
c7d86eca76 Change shebang to python2 instead of python 2016-12-06 15:01:20 +01:00
Mark Vander Stel
d92f00d97d Update strings and items to 1.11
Update all strings and vars to 1.11.
Add new items and blocks to items.py.
2016-11-29 09:13:42 -05:00
Mark Vander Stel
23c00eaf1f Add new 1.11 blocks
Add observer, with 4 textures and 6 orientations.
Add shulker box, with 16 block IDs, an entity texture, and 6
orientations.
2016-11-29 09:13:35 -05:00
Nicolas F
4287fc5f0b Add -q alias for --quiet to genPOI
This brings it in line with the syntax of the main overviewer.py
script.
2016-06-30 09:04:49 +02:00
Aaron Griffith
1a41d8d195 bump overviewer.h version, textures.py version 2016-06-11 16:38:19 -04:00
Aaron Griffith
24e9f9e6e8 Merge remote-tracking branch 'dbergl/1.10-blocks' 2016-06-10 20:44:37 -04:00
Aaron Griffith
7bbc3bd4d4 Merge branch 'patch-3' of git://github.com/tazorax/Minecraft-Overviewer 2016-06-10 20:43:14 -04:00
Aaron Griffith
125c87b195 Merge remote-tracking branch 'Socolin/patch-3' 2016-06-10 20:37:30 -04:00
Aaron Griffith
11c10972e2 Merge remote-tracking branch 'kevinwchang/filter-id' 2016-06-10 20:31:28 -04:00
Aaron Griffith
5571f4eb54 Merge remote-tracking branch 'CounterPillow/corrupt-region-warning' 2016-06-10 20:22:40 -04:00
Aaron Griffith
5665beb43f Merge remote-tracking branch 'mc680x0/master' 2016-06-10 20:21:03 -04:00
Aaron Griffith
1c25b16ec6 fixed typo in biomes.h 2016-06-10 20:15:18 -04:00
Dan Berglund
67a77c7c05 Revert temp & humidity changes and add missing biomes 2016-06-10 14:33:00 -07:00
Dan Berglund
d20c4a37e7 Add new 1.7.2 biomes and update colors
temp/humnidity was calculated so it matched the pixel at the start of each biome
as shown in the color template (http://minecraft.gamepedia.com/File:Biomes1.7.2.png)
TODO: switch to using coordinates in the image instead of temp/humidity
2016-06-10 14:33:00 -07:00
Dan Berglund
7a98e6afa9 add new 1.10 blocks 2016-06-10 12:07:11 -07:00
tazo
218b0a5996 Fix chorus plants 2016-03-06 15:33:49 +01:00
tazo
7baade948d Add chorus plants and chorus flowers 2016-03-06 15:32:20 +01:00
tazo
a32582013f Fix beetroots duplication 2016-03-06 10:22:17 +01:00