Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-11-27 21:24:47 +01:00
Code Issues Projects Releases Wiki Activity
277 Commits 6 Branches 104 Tags 7.8 MiB
0590a41d39
Commit Graph

183 Commits

Author SHA1 Message Date
Blue (Lukas Rieger)
0590a41d39 Merge branch 'mc/1.13' into mc/1.12 2020-07-29 20:30:06 +02:00
Blue (Lukas Rieger)
ca4fec8c1a Remove now unneeded exceptions 2020-07-29 20:11:25 +02:00
Blue (Lukas Rieger)
a33dda0a29 More sanity checks and fallbacks to chunkloaders and better IOException handling 2020-07-29 20:00:58 +02:00
Blue (Lukas Rieger)
a4c8004834 Add some extra sanity checks and fallbacks to chunkloaders 2020-07-29 18:04:16 +02:00
Blue (Lukas Rieger)
d97560cc82 Optimize chunk filter a little 2020-07-29 17:06:50 +02:00
Blue (Lukas Rieger)
aaeeeb136a Actually, we should not rely on an exception here 2020-07-29 16:43:04 +02:00
Blue (Lukas Rieger)
6e123e1c3f Treat not existent region files as empty (not generated) chunks. Fixes #57 2020-07-29 16:36:38 +02:00
Blue (Lukas Rieger)
71c165fe53 Push apache.commons lang3 dependency version to fix an NPE 2020-07-29 16:26:58 +02:00
Blue (Lukas Rieger)
e59a1c2878 Merge branch 'mc/1.13' into mc/1.12 2020-07-02 20:00:29 +02:00
Blue (Lukas Rieger)
4ea40c7611 Define EPSILON, since it seems not to be defined by default on all systems. Fixes #48 2020-07-02 19:52:28 +02:00
Blue (Lukas Rieger)
1bb46417eb Merge branch 'mc/1.13' into mc/1.12 2020-07-02 17:43:46 +02:00
Blue (Lukas Rieger)
4fbd785b3e Catch exception when a model defines a collapsed face. Fixes #43 2020-07-02 17:37:58 +02:00
Blue (Lukas Rieger)
0fe7cf94a9 Add texture-key check. Fixes #53 2020-07-02 16:41:19 +02:00
Blue (Lukas Rieger)
6ece66dcee Merge branch 'mc/1.13' into mc/1.12 2020-07-02 16:01:45 +02:00
Blue (Lukas Rieger)
67cb42fa40 Add support for reading 1.16 region-files 2020-05-15 12:39:19 +02:00
Blue (Lukas Rieger)
a4afee6044 Merge branch 'mc/1.13' into mc/1.12 2020-05-11 14:43:16 +02:00
Blue (Lukas Rieger)
8a43c3e596 Sanity-check map-ids and add config to ignore missing light-data, fixes #35 and fixes #38 2020-05-11 14:42:30 +02:00
Blue (Lukas Rieger)
466a1f3ca8 Merge branch 'mc/1.13' into mc/1.12 2020-05-11 13:27:08 +02:00
Blue (Lukas Rieger)
0535a29f8e Command and world-name improvements 2020-05-10 17:29:16 +02:00
Blue (Lukas Rieger)
3cf3ddd394 Merge branch 'mc/1.13' into mc/1.12 2020-05-10 01:28:30 +02:00
Blue (Lukas Rieger)
cf74a70f32 Suppress some compile warnings 
The resource can not be closed at this point, it will be closed later so we ignore the warning.
 2020-04-24 09:11:52 +02:00
Blue (Lukas Rieger)
b6c0d64d62 Implement API 1.1.0 and fix flickering with markers when zoomed out 2020-04-23 18:08:19 +02:00
Blue (Lukas Rieger)
424652ed32 Merge branch 'mc/1.13' into mc/1.12 2020-04-20 18:10:52 +02:00
Blue (Lukas Rieger)
f813f9d925 Fix error without marker.json 2020-04-20 18:08:51 +02:00
Blue (Lukas Rieger)
01eac5a6d7 Merge branch 'mc/1.13' into mc/1.12 2020-04-20 16:47:38 +02:00
Blue (Lukas Rieger)
cd2b9ec650 Add missing licence headers 2020-04-20 12:50:28 +02:00
Blue (Lukas Rieger)
d3828bcbfd Merge branch 'mc/1.13' into mc/1.12 2020-04-20 12:35:19 +02:00
Blue (Lukas Rieger)
ba69d26c85 Fix loading and saving of markers.json to correctly merge changes 2020-04-20 12:33:55 +02:00
Blue (Lukas Rieger)
44ab026060 Merge branch 'mc/1.13' into mc/1.12 2020-04-19 20:27:46 +02:00
Blue (Lukas Rieger)
6acc75674c Merge branch 'feature/marker' into mc/1.13 2020-04-19 20:13:02 +02:00
Blue (Lukas Rieger)
d8e189528e Implement MarkerAPI 2020-04-19 20:12:37 +02:00
Blue (Lukas Rieger)
2cbff3ccdb Complete implementing markers on the web-client 2020-04-17 14:56:30 +02:00
Blue (Lukas Rieger)
6ef77aefb2 Merge branch 'mc/1.13' into mc/1.12 2020-04-16 15:44:03 +02:00
Blue (Lukas Rieger)
2f79c61d8c Remove unwanted log 2020-04-16 15:42:20 +02:00
Blue (Lukas Rieger)
98a253adc9 Merge branch 'mc/1.13' into mc/1.12 2020-04-16 15:32:18 +02:00
Blue (Lukas Rieger)
eb93b7d1ab Fix some issues with rendering with map-limits 2020-04-16 15:31:33 +02:00
Blue (Lukas Rieger)
9a09f39b5a First part on implementing markers 2020-04-16 12:33:24 +02:00
Blue (Lukas Rieger)
7bcb43fce6 Merge branch 'mc/1.13' into mc/1.12 2020-04-09 20:13:17 +02:00
Blue (Lukas Rieger)
677dfcda02 Change the way images are cropped hopefully fixing #32 2020-04-09 17:56:08 +02:00
Blue (Lukas Rieger)
fc05696385 Merge branch 'mc/1.13' into mc/1.12 2020-04-07 21:05:06 +02:00
Blue (Lukas Rieger)
8d9220f611 Correct build setups for CLI and Forge implementations 2020-04-06 17:55:35 +02:00
Blue (Lukas Rieger)
43a579adfe Merge branch 'mc/1.13' into mc/1.12 2020-04-06 17:19:11 +02:00
Blue (Lukas Rieger)
24c50c27c6 Revert "Fix loading some chunk formats in 1.12. Fixes #33" 
This reverts commit 1ddc229047.
 2020-04-06 14:18:40 +02:00
Blue (Lukas Rieger)
768f28fb8f Merge branch 'mc/1.13' into mc/1.12 2020-04-04 16:10:56 +02:00
Blue (Lukas Rieger)
1ddc229047 Fix loading some chunk formats in 1.12. Fixes #33 2020-04-04 15:57:59 +02:00
Blue (Lukas Rieger)
323cb1bc81 Change project setup: split targets into different jars and relocate shadowed libs 2020-03-30 01:45:32 +02:00
Blue (Lukas Rieger)
0ffd46cdea Merge branch 'mc/1.13' into mc/1.12 2020-03-29 11:50:18 +02:00
Blue (Lukas Rieger)
de8031effd Push version for next release 2020-03-29 11:47:37 +02:00
Blue (Lukas Rieger)
62ce024dc6 Better tentative fix for #24 2020-03-28 16:25:38 +01:00
Blue (Lukas Rieger)
de7b0cba02 Tentative fix for #24 2020-03-27 15:41:09 +01:00