Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-11-28 05:26:23 +01:00
Code Issues Projects Releases Wiki Activity
255 Commits 6 Branches 104 Tags 7.9 MiB
6ece66dcee
Commit Graph

170 Commits

Author SHA1 Message Date
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
Blue (Lukas Rieger)
533d5e86be Merge branch 'mc/1.13' into mc/1.12 2020-03-26 12:08:18 +01:00
Blue (Lukas Rieger)
85f5d8947b Fix empty path resolving 2020-03-26 12:07:17 +01:00
Blue (Lukas Rieger)
b8f66d7a6f Merge branch 'mc/1.13' into mc/1.12 2020-03-25 22:31:34 +01:00
Blue (Lukas Rieger)
5421f956d2 Fix lighting bug and two bugs with resource-loading 2020-03-25 21:54:59 +01:00
Blue (Lukas Rieger)
d0c6c00e43 Merge branch 'mc/1.13' into mc/1.12 2020-03-17 20:27:39 +01:00
Blue (Lukas Rieger)
46875b9e68 Fix rounding bevore saving does not work correctly 2020-03-17 20:23:59 +01:00
Blue (Lukas Rieger)
772397f8d3 Merge branch 'mc/1.13' into mc/1.12 2020-03-14 18:24:01 +01:00
Blue (Lukas Rieger)
d21f6baf68 Push version for new release 2020-03-14 18:21:10 +01:00
Blue (Lukas Rieger)
54acd321f9 Fix a bug that prevents map changing via url and add sky color to dimensions 2020-03-14 18:18:02 +01:00
Blue (Lukas Rieger)
962d733411 Correct resource format for 1.12 2020-03-14 17:44:33 +01:00
Blue (Lukas Rieger)
103ac2053f Merge branch 'mc/1.13' into mc/1.12 2020-03-14 17:10:12 +01:00
Blue (Lukas Rieger)
275076bf66 Add menu footer, block-info hightlight and renamed a switch 2020-03-14 17:09:40 +01:00
Blue (Lukas Rieger)
2ed2fa3e35 Add click menu and debug option to web-app and fix two render-saving bugs that caused corrupted files sometimes 2020-03-13 18:11:31 +01:00