Commit graph

2107 commits

Author SHA1 Message Date
mikeprimm
443b57b79a Merge pull request #2748 from Ry0taK/v3.0
Update Jetty to 9.4.24
2020-01-22 10:48:50 -06:00
RyotaK
8487c59fc4 Merge branch 'v3.0' into v3.0 2020-01-19 10:14:42 +09:00
Mike Primm
ecf5134c22 Fix ladder model 2020-01-12 20:17:22 -06:00
Mike Primm
9785f98a91 Switch to SNAPSHOT 2020-01-12 19:15:19 -06:00
Mike Primm
ca880437a5 Drop Forge 1.13.2 build until it is fixed 2020-01-12 19:13:53 -06:00
Mike Primm
948184d099 Fix forge 1.13.2 mappings 2020-01-12 18:31:01 -06:00
RyotaK
60b767f38b Revert URL of gradle 2020-01-13 00:14:35 +00:00
RyotaK
e015b862b3 Revert gradle-wrapper.properties 2020-01-13 00:13:34 +00:00
RyotaK
d099f9c32d Fix indent 2020-01-13 00:11:35 +00:00
RyotaK
80ad51badd Fix dependency format 2020-01-13 00:09:55 +00:00
RyotaK
8dfacc9d12 Update Jetty 2020-01-13 00:03:57 +00:00
Mike Primm
54f87042e4 Bump to beta-9 2019-12-22 18:51:07 -06:00
Mike Primm
8d1067e6de 1.13.2 build fix 2019-12-22 18:15:35 -06:00
Mike Primm
344a762425 Jetty CERT mitigation 2019-12-22 18:13:50 -06:00
Mike Primm
5e139faf16 Another attempt to sort of 1.13.2 build 2019-12-22 18:13:36 -06:00
Mike Primm
c17d9d644d Merge branch 'v3.0' of https://github.com/webbukkit/dynmap.git into v3.0 2019-12-21 23:00:50 -06:00
Mike Primm
4f839d1a94 Fix dependency in 1.13.2 build 2019-12-21 22:59:57 -06:00
mikeprimm
0a4cef6a1c 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
7ee2bb1507 Revert api-version change - problems with 1.15.1 2019-12-20 20:26:18 -06:00
Mitch Talmadge
2383712d3d Change 'int blkid' to 'String material' for block and sign-change events. 2019-12-19 21:36:09 -07:00
Mike Primm
f495691833 Back to SNAPSHOT 2019-12-17 19:27:30 -06:00
Mike Primm
b467e18030 Bump to beta-8 2019-12-17 19:08:34 -06:00
Mike Primm
fb0ea1b948 Update for Spigot 1.15.1 2019-12-17 19:06:12 -06:00
Mike Primm
009e4dcdb2 Back to SNAPSHOT 2019-12-15 20:56:04 -06:00
Mike Primm
6ae499c5f4 Merge branch 'v3.0' of https://github.com/webbukkit/dynmap.git into v3.0 2019-12-15 14:23:38 -06:00
Mike Primm
ee64ad7663 Add new 1.15 blocks (beehive, bee nest, honey, honeycomb) 2019-12-15 14:22:14 -06:00
mikeprimm
b75206b8e8 Merge pull request #2585 from TheDGOfficial/patch-1
Fix missing api-version warning
2019-12-15 13:15:51 -06:00
Mike Primm
58aed1cc56 Use LuckPerms 4 API for older LuckPerms, and 5 for newer ones 2019-12-15 12:53:50 -06:00
Mike Primm
b34b7617b5 Alter default behavior when no SkyLight to 'full' vs 'none' 2019-12-15 12:18:52 -06:00
Mike Primm
18d2add463 Fix for legacy vs 1.15 biome layout 2019-12-15 09:44:16 -06:00
Mike Primm
a0aa3adfa1 Update PostgresSQL code to handle fullrender resume updates 2019-12-15 01:36:59 -06:00
mikeprimm
1eb2cd8727 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
36e883abaf More PR merge fixes... 2019-12-15 01:08:31 -06:00
Mike Primm
eb8c1e0b63 Merge branch 'v3.0' of https://github.com/webbukkit/dynmap.git into v3.0 2019-12-15 00:59:48 -06:00
Mike Primm
fe03b2468d Fix sign check PR 2019-12-15 00:59:30 -06:00
mikeprimm
f2e2b5d2ee 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
d55eacb903 Merge branch 'v3.0' into v3.0 2019-12-15 00:46:31 -06:00
mikeprimm
d8a21102c2 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
a96f67d0eb Merge pull request #2618 from baconwaifu/postgres
Add initial postgres database support.
2019-12-15 00:42:01 -06:00
mikeprimm
ced3c580bb Merge pull request #2586 from ExerciseBook/v3.0
HD skins support
2019-12-15 00:39:51 -06:00
Mike Primm
e43a3148bc Patch up 1.15 water shading 2019-12-15 00:26:17 -06:00
Mike Primm
669b112b7a Get 1.13.2 forge building again 2019-12-14 23:12:44 -06:00
mikeprimm
2fc9301cfa Merge pull request #2692 from pk910/v3.0
spigot 1.15 support
2019-12-14 22:12:19 -06:00
mikeprimm
43f838edca Merge branch 'v3.0' into v3.0 2019-12-14 22:09:42 -06:00
mikeprimm
24e260c13c Merge pull request #2691 from JAysz0n/v3.0
Added support for 1.15
2019-12-14 21:58:48 -06:00
mikeprimm
7623ba449f Merge pull request #2694 from RalphORama/v3.0
Enable parallel Gradle builds
2019-12-14 21:52:15 -06:00
Ralph Drake
97551c9151 Update gradle.properties 2019-12-14 18:17:02 -05:00
baconwaifu
97808d7816 Change marker column to BYTEA to make markers work again. 2019-12-14 15:25:56 -05:00
mikeprimm
e036ef1970 Merge pull request #2670 from SijmenSchoon/v3.0
Update LuckPerms and bStats
2019-12-14 13:38:29 -06:00
mikeprimm
6a0ea88be0 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