Upstream
/
dynmap
mirror of https://github.com/webbukkit/dynmap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,096 Commits 6 Branches 128 Tags 33 MiB
Commit Graph

2096 Commits

Author SHA1 Message Date
Mike Primm 360916f5aa Bump to beta-9 2019-12-22 18:51:07 -06:00
Mike Primm 997ff1b0db 1.13.2 build fix 2019-12-22 18:15:35 -06:00
Mike Primm e9e34e0e90 Jetty CERT mitigation 2019-12-22 18:13:50 -06:00
Mike Primm 58186bd478 Another attempt to sort of 1.13.2 build 2019-12-22 18:13:36 -06:00
Mike Primm 34beb50177 Merge branch 'v3.0' of https://github.com/webbukkit/dynmap.git into v3.0 2019-12-21 23:00:50 -06:00
Mike Primm fa4373fcaa Fix dependency in 1.13.2 build 2019-12-21 22:59:57 -06:00
mikeprimm 96aa816227
Merge pull request #2710 from MitchTalmadge/v3.0 
Use Material instead of Block ID in SignChangeEvent and BlockEvent (Fixes #2699)
 2019-12-20 20:38:03 -06:00
Mike Primm 178681d284 Revert api-version change - problems with 1.15.1 2019-12-20 20:26:18 -06:00
Mitch Talmadge a3cb46e286 Change 'int blkid' to 'String material' for block and sign-change events. 2019-12-19 21:36:09 -07:00
Mike Primm 5dbb58dfda Back to SNAPSHOT 2019-12-17 19:27:30 -06:00
Mike Primm 63d1127d3e Bump to beta-8 2019-12-17 19:08:34 -06:00
Mike Primm ad621306e8 Update for Spigot 1.15.1 2019-12-17 19:06:12 -06:00
Mike Primm 07c5edf15a Back to SNAPSHOT 2019-12-15 20:56:04 -06:00
Mike Primm f81f93f890 Merge branch 'v3.0' of https://github.com/webbukkit/dynmap.git into v3.0 2019-12-15 14:23:38 -06:00
Mike Primm fce54cc0e3 Add new 1.15 blocks (beehive, bee nest, honey, honeycomb) 2019-12-15 14:22:14 -06:00
mikeprimm 2c5a467985
Merge pull request #2585 from TheDGOfficial/patch-1 
Fix missing api-version warning
 2019-12-15 13:15:51 -06:00
Mike Primm b966903331 Use LuckPerms 4 API for older LuckPerms, and 5 for newer ones 2019-12-15 12:53:50 -06:00
Mike Primm 70ae3fbc37 Alter default behavior when no SkyLight to 'full' vs 'none' 2019-12-15 12:18:52 -06:00
Mike Primm deb81d984b Fix for legacy vs 1.15 biome layout 2019-12-15 09:44:16 -06:00
Mike Primm 40472f88fd Update PostgresSQL code to handle fullrender resume updates 2019-12-15 01:36:59 -06:00
mikeprimm 49ea99b703
Merge pull request #2633 from Marvosg/v3.0 
Resume full renders (skip already rendered tiles)
 2019-12-15 01:10:28 -06:00
Mike Primm 10d03ef2ee More PR merge fixes... 2019-12-15 01:08:31 -06:00
Mike Primm f3d6965c53 Merge branch 'v3.0' of https://github.com/webbukkit/dynmap.git into v3.0 2019-12-15 00:59:48 -06:00
Mike Primm a91e258da8 Fix sign check PR 2019-12-15 00:59:30 -06:00
mikeprimm be9aac072d
Merge pull request #2623 from gabsoftware/v3.0 
fixed disappearing markers (webbukkit#2533), many thanks to tiagoad
 2019-12-15 00:46:39 -06:00
mikeprimm bf404ee626
Merge branch 'v3.0' into v3.0 2019-12-15 00:46:31 -06:00
mikeprimm 33b4fb7042
Merge pull request #2584 from tiagoad/v3.0 
Fix for disappearing sign-markers on 1.14 (Issue #2533)
 2019-12-15 00:44:27 -06:00
mikeprimm 05dc55abc2
Merge pull request #2618 from baconwaifu/postgres 
Add initial postgres database support.
 2019-12-15 00:42:01 -06:00
mikeprimm 3eebde9170
Merge pull request #2586 from ExerciseBook/v3.0 
HD skins support
 2019-12-15 00:39:51 -06:00
Mike Primm fae7fded40 Patch up 1.15 water shading 2019-12-15 00:26:17 -06:00
Mike Primm 29f3774c7c Get 1.13.2 forge building again 2019-12-14 23:12:44 -06:00
mikeprimm 475db4a97c
Merge pull request #2692 from pk910/v3.0 
spigot 1.15 support
 2019-12-14 22:12:19 -06:00
mikeprimm 69e42c83db
Merge branch 'v3.0' into v3.0 2019-12-14 22:09:42 -06:00
mikeprimm 700259f979
Merge pull request #2691 from JAysz0n/v3.0 
Added support for 1.15
 2019-12-14 21:58:48 -06:00
mikeprimm 779d3ff2c8
Merge pull request #2694 from RalphORama/v3.0 
Enable parallel Gradle builds
 2019-12-14 21:52:15 -06:00
Ralph Drake 95cc8c687a
Update gradle.properties 2019-12-14 18:17:02 -05:00
baconwaifu 5fe21ff8c8 Change marker column to BYTEA to make markers work again. 2019-12-14 15:25:56 -05:00
mikeprimm e14179bff6
Merge pull request #2670 from SijmenSchoon/v3.0 
Update LuckPerms and bStats
 2019-12-14 13:38:29 -06:00
mikeprimm 4e7448dd8f
Merge pull request #2668 from lennartbecker/load-map-updates-immediately 
Standalone: Load changes immediately after page load
 2019-12-14 08:33:44 -06:00
mikeprimm 4a5e14ee73
Merge pull request #2654 from linuxdaemon/v3.0+fix-mariadb-driver-pkg 
Fix MariaDB Driver package name
Thanks!
 2019-12-14 08:29:40 -06:00
mikeprimm bc72cb0e6f
Merge pull request #2655 from EnKrypt/patch-1 
Fixed typo in config file comment
Thanks!
 2019-12-14 08:28:58 -06:00
mikeprimm 40dcd8748d
Merge pull request #2649 from pavog/patch-1 
Fix typo for "LuckPerms" in plugin.yml softdepend

Thanks!
 2019-12-14 08:28:28 -06:00
mikeprimm 72cae6fc74
Merge pull request #2644 from MiniDigger/patch-1 
Add new repo for bStats, fixes #2643

Looks good - thanks!   All my machines have things cached, so missed this impact
 2019-12-14 08:27:46 -06:00
mikeprimm ad4440b263
Merge pull request #2557 from injust/patch-1 
Remove duplicate of onblockfade trigger
 2019-12-14 08:02:54 -06:00
pk910 168850f61e fixed biome data handling in MapChunkCache115.java 2019-12-14 06:31:15 +01:00
pk910 73bab0a37f experimental spigot 1.15 support 2019-12-12 21:27:39 +01:00
BuildTools ebd883b1c2 Added support for 1.15 2019-12-12 21:15:11 +01:00
Mike Primm a1351ed094 Force lower case on tiles and matchTiles references in CTM 2019-12-08 01:55:39 -06:00
Mike Primm f910b1135d Fix texture order handling for mod support API handling for stairs 2019-12-08 01:01:21 -06:00
Mike Primm 24bb87d635 Fix incorrect transparency handling on copyblock: texture handling 2019-12-08 00:59:19 -06:00