Merge remote-tracking branch 'origin/v3.0' into fabric
# Conflicts: # settings.gradle
This commit is contained in:
commit
57b65bc135
98 changed files with 6741 additions and 37 deletions
|
|
@ -4,12 +4,14 @@ include ':bukkit-helper-113-2'
|
|||
include ':bukkit-helper-114-1'
|
||||
include ':bukkit-helper-115'
|
||||
include ':bukkit-helper-116'
|
||||
include ':bukkit-helper-116-2'
|
||||
include ':bukkit-helper'
|
||||
include ':dynmap-api'
|
||||
include ':DynmapCore'
|
||||
include ':DynmapCoreAPI'
|
||||
include ':fabric-1.16.1'
|
||||
include ':fabric-1.16.2'
|
||||
include ':fabric-1.16.1'
|
||||
include ':forge-1.16.2'
|
||||
include ':forge-1.16.1'
|
||||
include ':forge-1.15.2'
|
||||
include ':forge-1.14.4'
|
||||
|
|
@ -22,12 +24,14 @@ project(':bukkit-helper-113-2').projectDir = "$rootDir/bukkit-helper-113-2" as F
|
|||
project(':bukkit-helper-114-1').projectDir = "$rootDir/bukkit-helper-114-1" as File
|
||||
project(':bukkit-helper-115').projectDir = "$rootDir/bukkit-helper-115" as File
|
||||
project(':bukkit-helper-116').projectDir = "$rootDir/bukkit-helper-116" as File
|
||||
project(':bukkit-helper-116-2').projectDir = "$rootDir/bukkit-helper-116-2" as File
|
||||
project(':bukkit-helper').projectDir = "$rootDir/bukkit-helper" as File
|
||||
project(':dynmap-api').projectDir = "$rootDir/dynmap-api" as File
|
||||
project(':DynmapCore').projectDir = "$rootDir/DynmapCore" as File
|
||||
project(':DynmapCoreAPI').projectDir = "$rootDir/DynmapCoreAPI" as File
|
||||
project(':fabric-1.16.1').projectDir = "$rootDir/fabric-1.16.1" as File
|
||||
project(':fabric-1.16.2').projectDir = "$rootDir/fabric-1.16.2" as File
|
||||
project(':fabric-1.16.1').projectDir = "$rootDir/fabric-1.16.1" as File
|
||||
project(':forge-1.16.2').projectDir = "$rootDir/forge-1.16.2" as File
|
||||
project(':forge-1.16.1').projectDir = "$rootDir/forge-1.16.1" as File
|
||||
project(':forge-1.15.2').projectDir = "$rootDir/forge-1.15.2" as File
|
||||
project(':forge-1.14.4').projectDir = "$rootDir/forge-1.14.4" as File
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue