Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-11-25 20:16:00 +01:00
Code Issues Projects Releases Wiki Activity
665 Commits 6 Branches 104 Tags 7.8 MiB
98236aaba2
Commit Graph

665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blue (Lukas Rieger)
f813f9d925 Fix error without marker.json 2020-04-20 18:08:51 +02:00
Blue (Lukas Rieger)
e410734108 Merge branch 'mc/1.13' 2020-04-20 16:46:30 +02:00
Blue (Lukas Rieger)
e91bb8a99f Push version for next release 2020-04-20 16:44:14 +02:00
Blue (Lukas Rieger)
bc472b8090 Merge branch 'mc/1.13' 2020-04-20 13:51:08 +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)
73c4151ef2 Merge branch 'mc/1.13' 2020-04-20 12:34:53 +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)
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)
cac4aece8b Merge branch 'mc/1.13' 2020-04-16 15:43:43 +02:00
Blue (Lukas Rieger)
2f79c61d8c Remove unwanted log 2020-04-16 15:42:20 +02:00
Blue (Lukas Rieger)
7856501001 Merge branch 'mc/1.13' 2020-04-16 15:32:55 +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)
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)
4ab43f2fc9 Merge branch 'mc/1.13' 2020-04-09 20:40:56 +02:00
Blue (Lukas Rieger)
05cfe7bd09 Bump version for next release 2020-04-09 20:37:52 +02:00
Blue (Lukas Rieger)
89fa4e6f95 Merge branch 'mc/1.13' 2020-04-09 20:12:44 +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)
ee4d84ee0a Merge branch 'mc/1.13' 2020-04-09 17:28:03 +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)
6145b81370 Forge is supported in mc1.15 2020-04-09 15:40:49 +02:00
Blue (Lukas Rieger)
25abe85b03 Merge branch 'mc/1.13' 2020-04-09 15:38:52 +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)
23528da625 Merge branch 'mc/1.13' 2020-04-07 21:04:55 +02:00
Blue (Lukas Rieger)
e9b8675c2c Finish first forge-mod implementation 2020-04-07 21:04:46 +02:00
Blue (Lukas Rieger)
0dfbc96dff Merge branch 'mc/1.13' 2020-04-07 14:56:13 +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)
3ffdd85177 Update version for mc 1.15 2020-04-06 17:09:09 +02:00
Blue (Lukas Rieger)
bc1a799e31 Merge branch 'mc/1.13' 2020-04-06 17:08:21 +02:00
Blue (Lukas Rieger)
77c11b9c06 Improve gradle version configuration 2020-04-06 17:08:10 +02:00
Blue (Lukas Rieger)
88ab4b2eb8 Merge branch 'mc/1.13' 2020-04-06 16:56:35 +02:00
Blue (Lukas Rieger)
5d5f489b1e Correct build setups for Sponge and Bukkit implementations 2020-04-06 16:54: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)
d172d0f27d Start implementing the forge-mod 2020-04-04 16:05: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)
85191b9fe6 Remove artifact upload from github workflow 2020-03-30 02:54:25 +02:00
Blue (Lukas Rieger)
9e6dcb7849 Merge branch 'feature/forge' into mc/1.13 2020-03-30 02:34:18 +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)
0816529f25 Escape special char in code 2020-03-29 19:25:54 +02:00
Blue (Lukas Rieger)
5f7517a9d6 Merge branch 'mc/1.13' 2020-03-29 11:49:03 +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