Merge branch 'v3.0' of git@github-home:webbukkit/dynmap.git into v3.0

This commit is contained in:
Mike Primm 2022-03-29 22:12:17 -05:00
commit 808ac64370
3 changed files with 15 additions and 4 deletions

View file

@ -36,6 +36,9 @@ ko
patreon patreon
README README
Gradle Gradle
gradlew
gradle
oldgradle
Curseforge Curseforge
SpigotMC SpigotMC
PaperMC PaperMC
@ -55,3 +58,4 @@ JDK
ForgeGradle ForgeGradle
Kosma Kosma
Kosma's Kosma's
DEV

View file

@ -905,15 +905,15 @@
color: #fff; color: #fff;
background: rgba(0,0,0,0.6); background: rgba(0,0,0,0.6);
padding: 2px; padding: 2px 6px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
} }
.dynmap .mapMarker .markerName16x16 { .dynmap .mapMarker .markerName16x16 {
top: -6px; top: -12px;
left: 10px; left: 12px;
} }
.dynmap .mapMarker .markerName8x8 { .dynmap .mapMarker .markerName8x8 {

View file

@ -13,7 +13,7 @@ Dynmap 3.x+ uses Gradle for building support for all platforms, with all resulti
default JDK must be a JDK 17 (or later) versions - older versions will still be compiled default JDK must be a JDK 17 (or later) versions - older versions will still be compiled
to run on the default JDK for those platforms (JDK 8, or JDK 16 for 1.17.x), and common libraries are built JDK 8. to run on the default JDK for those platforms (JDK 8, or JDK 16 for 1.17.x), and common libraries are built JDK 8.
To build, run: To build and get all jars in `target/`, run:
./gradlew setup build ./gradlew setup build
@ -32,6 +32,13 @@ Or (on Windows):
cd oldgradle cd oldgradle
gradlew.bat setup build gradlew.bat setup build
Those familiar with gradle can save time by specifying a build (or commenting in settings.gradle) BUT this is not suitable for uploading DEV code changes.
NOTE: PR code submissions MUST be built and TESTED for ALL platforms (including oldgradle), or be rejected and negatively influence future approvals.
For more check [contributing rules](#contributing-to-dynmaps-code).
./gradlew :fabric-1.18:build
# What platforms are supported? # What platforms are supported?
The following target platforms are supported, and you can find them at the links supplied: The following target platforms are supported, and you can find them at the links supplied: