Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-11-30 22:44:23 +01:00
Code Issues Projects Releases Wiki Activity
249 Commits 6 Branches 104 Tags 7.9 MiB
466a1f3ca8
Commit Graph

249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blue (Lukas Rieger)
466a1f3ca8 Merge branch 'mc/1.13' into mc/1.12 2020-05-11 13:27:08 +02:00
Blue (Lukas Rieger)
7c319d7ff7 Bump version for new release 2020-05-11 13:26:16 +02:00
Blue (Lukas Rieger)
90473bd83b More command improvements 2020-05-11 13:23:56 +02:00
Blue (Lukas Rieger)
0535a29f8e Command and world-name improvements 2020-05-10 17:29:16 +02:00
Blue (Lukas Rieger)
acaff30b76 Fix sponge command usage 2020-05-10 01:44:12 +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)
a246da133c Rework commands 2020-05-10 01:28:09 +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)
341c1591fd Push version for bugfix release 2020-04-20 18:09:49 +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)
e91bb8a99f Push version for next release 2020-04-20 16:44:14 +02:00
Blue (Lukas Rieger)
4d202ca094 Dont relocate API dependencies 2020-04-20 13:49:56 +02:00
Blue (Lukas Rieger)
cd2b9ec650 Add missing licence headers 2020-04-20 12:50:28 +02:00
Blue (Lukas Rieger)
3ce89bf51a Remove mistakenly commited test-code (oops) 2020-04-20 12:42:24 +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)
fe8e7f6bc4 Merge branch 'mc/1.13' into mc/1.12 2020-04-16 12:33:47 +02:00
Blue (Lukas Rieger)
9a09f39b5a First part on implementing markers 2020-04-16 12:33:24 +02:00
Blue (Lukas Rieger)
e30b94efe8 Update workflow to checkout submodules 2020-04-10 17:23:08 +02:00
Blue (Lukas Rieger)
bc16ef5d26 First Renderer-API implementation 2020-04-10 17:16:47 +02:00
Blue (Lukas Rieger)
b7a1150b18 Add BlueMapAPI submodule 2020-04-09 22:15:08 +02:00
Blue (Lukas Rieger)
a6a13c241e Merge branch 'mc/1.13' into mc/1.12 2020-04-09 20:41:56 +02:00
Blue (Lukas Rieger)
05cfe7bd09 Bump version for next release 2020-04-09 20:37:52 +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)
4e8f23ad29 Merge branch 'mc/1.13' of https://github.com/BlueMap-Minecraft/BlueMap into mc/1.13 2020-04-09 20:10:09 +02:00
Lukas Rieger
41d059f429
Use v2-preview of upload-action to upload the jars again 2020-04-09 19:52:07 +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)
a1487ae7ad Merge branch 'mc/1.13' into mc/1.12 2020-04-09 17:28:26 +02:00
Blue (Lukas Rieger)
2f046b63d4 Add delay for scheduling tile-renders after a world-save. Fixes #24 and fixes #30 2020-04-09 17:14:00 +02:00
Blue (Lukas Rieger)
256e38c0ee Sponge is supported in mc1.12 2020-04-09 15:38:16 +02:00
Blue (Lukas Rieger)
1dfdd1b415 Merge branch 'mc/1.13' into mc/1.12 2020-04-09 15:37:23 +02:00
Blue (Lukas Rieger)
45b8f52862 Forge and Sponge versions not supported in mc1.13 2020-04-09 15:35:52 +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)
e9b8675c2c Finish first forge-mod implementation 2020-04-07 21:04:46 +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)
2228fc8ef1 Update version for mc 1.12 2020-04-06 17:19:44 +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)
77c11b9c06 Improve gradle version configuration 2020-04-06 17:08:10 +02:00
Blue (Lukas Rieger)
5d5f489b1e Correct build setups for Sponge and Bukkit implementations 2020-04-06 16:54:11 +02:00