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

552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blue (Lukas Rieger)
15cbfe13cb Push version for release 2020-07-02 20:00:04 +02:00
Blue (Lukas Rieger)
f492e2c278 Merge branch 'mc/1.13' 2020-07-02 19:52:50 +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)
95647acb1e Merge branch 'mc/1.13' 2020-07-02 17:39:16 +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)
4c65c475dd Fix possible NPE when loading render-manager state. Fixes #46 2020-07-02 17:20:27 +02:00
Blue (Lukas Rieger)
53093a43ff Fix map name being compared instead of map-id. Fixes #51 2020-07-02 17:14:16 +02:00
Blue (Lukas Rieger)
a2cefd78aa Change command requirements for base command. Fixes #52 2020-07-02 17:11:38 +02:00
Blue (Lukas Rieger)
0fe7cf94a9 Add texture-key check. Fixes #53 2020-07-02 16:41:19 +02:00
Blue (Lukas Rieger)
55d5e6d4f6 Merge branch 'master' of https://github.com/BlueMap-Minecraft/BlueMap 2020-07-02 15:52:42 +02:00
Blue (Lukas Rieger)
032a640255 Update spigot and resources to support 1.16 2020-07-02 15:52:22 +02:00
Blue (Lukas Rieger)
5282bdc284 Merge branch 'mc/1.13' 2020-07-02 15:38:09 +02:00
Blue (Lukas Rieger)
484e4d0779 First changes towards live updates 2020-07-02 13:08:47 +02:00
Blue (Lukas Rieger)
46e1e0e665 Fix forge 1.15 release for master branch 2020-05-30 19:57:08 +02:00
Blue (Lukas Rieger)
19fdd6df67 Revert forge-version change for master branch 
This reverts commit ebbdd225cc.
 2020-05-30 19:53:18 +02:00
Blue (Lukas Rieger)
69454e7174 Merge branch 'mc/1.13' 2020-05-30 19:51:04 +02:00
Blue (Lukas Rieger)
ebbdd225cc Change forge version to 1.14.4 in mc/1.13 release 2020-05-30 19:50:55 +02:00
Blue (Lukas Rieger)
67cb42fa40 Add support for reading 1.16 region-files 2020-05-15 12:39:19 +02:00
Brandon Davis
e1370c8157 include dependencies with new task 2020-05-12 12:49:44 -05:00
Blue (Lukas Rieger)
0a69aab2a3 Merge branch 'mc/1.13' 2020-05-11 22:14:13 +02:00
Blue (Lukas Rieger)
54364c40ee Update README 2020-05-11 22:13:46 +02:00
Blue (Lukas Rieger)
c61c984d6f Start implementing a fabric target 2020-05-11 20:07:39 +02:00
Blue (Lukas Rieger)
2b644e7254 Merge branch 'mc/1.13' 2020-05-11 14:42:52 +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)
22961959bd Merge branch 'mc/1.13' 2020-05-11 13:26:40 +02:00
Blue (Lukas Rieger)
7c319d7ff7 Bump version for new release 2020-05-11 13:26:16 +02:00
Blue (Lukas Rieger)
8b4e6a3a32 Merge branch 'mc/1.13' 2020-05-11 13:24:52 +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)
95afba305f Merge branch 'mc/1.13' 2020-05-10 01:44:24 +02:00
Blue (Lukas Rieger)
acaff30b76 Fix sponge command usage 2020-05-10 01:44:12 +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)
bd7de954ce Merge branch 'mc/1.13' 2020-04-23 18:09:04 +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)
12d944657d Merge branch 'mc/1.13' 2020-04-20 18:10:27 +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)
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