LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity
2,295 Commits 3 Branches 0 Tags
2c5971b5d80f46bf6ee49a3ec05a9679ec5945ad
Commit Graph

2295 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lother
2c5971b5d8 fix typo 2016-03-04 23:48:30 +08:00
lother
404ef9f0ad add frosted ice, structure_block 2016-03-04 23:32:07 +08:00
lother
1ba8342ca1 fix purpur pilar orientation 2016-03-04 23:31:45 +08:00
lother
0f33b65a85 add beetroot 2016-03-04 23:30:51 +08:00
lother
75a3ee5650 fix command block 2016-03-04 23:30:25 +08:00
lother
e4e2bae99e add end_gateway 2016-03-04 23:29:25 +08:00
Andrew Chin
5f9276a24a Implement path blocks 
Farmland now shares a bit of code with pathblocks and are rendered at a
15/16th sized block
 2016-03-03 21:22:09 -05:00
Andrew Chin
81be4bc6e8 Bump mc version in travis and textures.py error msg. also force rebuild 2016-03-01 21:29:51 -05:00
Andrew Chin
bc9a097957 Add some new blocks for Minecraft 1.9 
* Purpur blocks, pillars, stairs, and slabs
* End brick
 2016-03-01 21:25:15 -05:00
Andrew Chin
8d3d8dc0ee Fix command block for Minecraft 1.9 
See #1280
 2016-03-01 20:47:22 -05:00
Andrew Chin
68955c7b93 Fix redstone dust for Minecraft 1.9 
This breaks compatibily with Minecraft 1.8

See #1280
 2016-03-01 20:46:02 -05:00
Nicolas F
525d19318f Merge Mirculus' inline changes. 2016-02-17 16:41:03 +01:00
Stefan Floeren
3d3ef0c82e Remove inline for estimate_blocklevel 
Inlining the function allows the compiler to optimize away the
function completely. Clang 3.7.1 does exactly that.

This leads to an error, if the library is used with python:

    % ./overviewer.py
    Traceback (most recent call last):
      File "/tmp/minecraft/Minecraft-Overviewer/overviewer_core/__init__.py", line 20, in check_c_overviewer
        import c_overviewer
    ImportError: /tmp/minecraft/Minecraft-Overviewer/overviewer_core/c_overviewer.so: undefined symbol: estimate_blocklevel

    Something has gone wrong importing the c_overviewer extension.  Please
    make sure it is up-to-date (clean and rebuild)
 2016-02-13 15:46:04 +01:00
Nicolas F
4e77ba8d13 genpoi: Fix GzipFile closing on python 2.6 
Fixes #1275
 2016-02-13 14:41:09 +01:00
Nicolas F
8f08b3b69f rcon: Throw more helpful exception if proto error 
Addresses #1273.
 2016-01-30 15:25:45 +01:00
Nicolas F
9fc050cf67 genPOI: Use "with" statement to close gzip files 
Previously, the files were not closed after reading or writing;
by using a "with" statement, the file handles will be closed as
soon as they go out of scope.

Possible fix for #1271.
 2016-01-30 14:17:16 +01:00
Nicolas F
c7f8cfee8c rcon: Wait for buffer to fill 
We should wait for the buffer to fill up to 12 bytes instead of
simply assuming it will.

Possible fix for #1273.
 2016-01-30 13:58:36 +01:00
Andrew Chin
a0766974b5 Merge pull request #1270 from tcyrus/patch-1 
Update README.rst
 2016-01-15 16:42:50 -05:00
Timothy Cyrus
bd1b3d073c Update README.rst 2016-01-15 16:30:49 -05:00
Andrew Chin
d849f25930 Merge pull request #1267 from overviewer/uuidcache 
genpoi UUID improvements
 2016-01-14 16:12:51 -05:00
Andrew Chin
2e34507568 Use FileReplacer to manage the uuid cache file 2016-02-01 09:32:35 -05:00
Andrew Chin
68430335c8 JSObserver: Add missing string formatting param 2015-12-27 15:04:32 -05:00
Andrew Chin
270741eb8f genpoi UUID improvements 
* When reading the cache, catch some errors on load, instead of crashing
* When writing to cache, write to tmp file, then move it into place.
  This should be more robust if a ctrl+c is recieved while writing the
  cache

Addresses #1266
 2015-12-27 14:59:03 -05:00
Andrew Chin
0ba0c60ed2 Catch TypeErrors as well when loading player dat files 2015-10-06 17:38:49 -04:00
Nicolas F
b8fb7652b2 More Travis whacking 2015-08-16 00:37:18 +02:00
Nicolas F
48cd0c4aa7 Let's whack travis with a wrench for a bit 2015-08-16 00:30:52 +02:00
Nicolas F
9ae3ac2916 Add mingw-w64 build documentation 2015-08-16 00:17:19 +02:00
Nicolas F
a8c71d089d Fix mingw-w64 build 
On Windows with mingw-w64, Pillow includes windows.h, and thus
including Imaging.h would result in a name conflict of "TRANSPARENT",
which windows.h #defines but overviewer.h wants to use as enum.

For the record, this used to not be broken back when I initially
fixed Pillow for mingw-w64, so the change got somewhere introduced
between then and now.
 2015-08-15 23:50:40 +02:00
Andrew Chin
afc1c4f924 Don't call save_cache if running with --skip-players 2015-08-14 08:47:52 -04:00
Nicolas F.
ebc54a59ef Merge pull request #1240 from enaut/docfixesStructureOverlay 
Small documentation bug for StructureOverlay.
 2015-07-04 01:04:20 +02:00
Franz Dietrich
788d90bbf2 Small documentation bug for StructureOverlay. 
When adding documentation for the StructureOverlay I missed some
copy and paste error.

fixes #1229
 2015-07-03 15:10:54 +02:00
Andrew Chin
dec9aada01 Hopefully a better fix for the sdist problem. 
Removing trailing slashes from MANIFEST.in file.  Why is this needed?
No idea, i hate distutils
 2015-06-24 11:42:41 -04:00
Andrew Chin
253f78c8d1 Revert "Add c_overveiwer_includes to the list of source files" 
This reverts commit d6d488c3ea.

Because achin is a doofus
 2015-06-24 11:41:26 -04:00
Andrew Chin
d6d488c3ea Add c_overveiwer_includes to the list of source files 
This seems to be needed to make "sdist" include these headerfiles. i
have no idea how/if this worked in the past
 2015-06-24 11:30:31 -04:00
Andrew Chin
ddfd88aad7 Update signs.rst 
Added small note about how to look for the Markers button on a successful genpoi
 2015-06-05 22:07:02 -04:00
Nicolas F
0aef9b436c [webassets] Updated jQuery version 2015-05-04 14:59:18 +02:00
Aaron Griffith
77cdc6db48 Merge pull request #1221 from markfickett/master 
Fix for repeated iteration of filter-function generator in handleEntities, for #1220 .
 2015-03-18 23:53:18 -04:00
Mark Fickett
f839068f27 Convert filter generator to list before passing to handleEntities to fix repeated iteration. Fixes #1220 . 2015-03-18 23:33:54 -04:00
Aaron Griffith
4a9d808bb2 Merge pull request #1219 from MasterofJOKers/player_poi_fix 
[genPOI] Fix generation of multiple players
 2015-03-12 13:00:24 -04:00
Aaron Griffith
0c7441f93d equality != assignment... 2015-03-12 12:25:41 -04:00
Aaron Griffith
88de7b1567 get genpoi multiprocessing working on windows 2015-03-12 12:21:39 -04:00
MasterofJOKers
803d8d7933 [genPOI] sort list of imports 
Easier to see if an import is already there.
 2015-03-12 15:56:48 +01:00
MasterofJOKers
adcf105778 [genPOI] fix generation of multiple players 
The same problem as in bd8f3577 is also present for players. The filters
were given as iterator, but iterated through once per player.
 2015-03-12 15:54:48 +01:00
Aaron Griffith
cc3bee821c Merge pull request #1217 from MasterofJOKers/manual_poi_fix 
[genPOI] Fix generation manual POIs
 2015-03-10 12:33:10 -04:00
MasterofJOKers
5764183e00 [genPOI] remove unnecessary second import of json 2015-03-09 09:37:10 +01:00
MasterofJOKers
bd8f357787 [genPOI] pass filters as list to handleManualPOI 
It was accidently passed as an iterator, so it was only iterable once,
which lead to only the first manual poi being displayed.
 2015-03-09 09:34:44 +01:00
Aaron Griffith
4cd47da768 Merge pull request #1215 from CounterPillow/signtriage 
[genPOI] Work around JSON signs
 2015-03-08 12:57:48 -04:00
Nicolas F
b35f848855 [genPOI] Work around utter plebbery 2015-03-08 17:03:43 +01:00
Nicolas F
b5ecf8a7f4 [genPOI] Work around JSON signs 
lol Mojang
 2015-03-07 18:16:32 +01:00
Andrew Chin
e6f44aed26 Merge pull request #1135 from MasterofJOKers/my_genpoi 
addressing genPOI RAM usage
 2015-03-06 17:09:40 -05:00