Skip to content

Commit

Permalink
Merge branch 'IntellectualSites:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Telesphoreo authored Apr 2, 2024
2 parents 26b1cec + 778c212 commit 9f72054
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ mapmanager = "1.8.0-SNAPSHOT"
griefprevention = "17.0.0"
griefdefender = "2.1.0-SNAPSHOT"
residence = "4.5._13.1"
towny = "0.100.1.24"
towny = "0.100.2.0"
plotsquared = "7.3.6"

# Third party
Expand Down
2 changes: 1 addition & 1 deletion worldedit-bukkit/adapters/adapter-1_20_4/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ repositories {

dependencies {
// url=https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/1.20.4-R0.1-SNAPSHOT
the<PaperweightUserDependenciesExtension>().paperDevBundle("1.20.4-R0.1-20240329.175742-144")
the<PaperweightUserDependenciesExtension>().paperDevBundle("1.20.4-R0.1-20240402.103709-145")
compileOnly(libs.paperlib)
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* The following classes are FAWE additions:
*
* @see com.sk89q.worldedit.cli.AccessPoint
* {@link com.sk89q.worldedit.cli.AccessPoint}
*/
package com.sk89q.worldedit.cli;
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
/**
* The following classes are FAWE additions:
*
* @see com.sk89q.worldedit.command.argument.ExpressionConverter
* @see com.sk89q.worldedit.command.argument.LocationConverter
* {@link com.sk89q.worldedit.command.argument.ExpressionConverter},
* {@link com.sk89q.worldedit.command.argument.LocationConverter}
*/
@org.enginehub.piston.util.NonnullByDefault
package com.sk89q.worldedit.command.argument;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* The following classes are FAWE additions:
*
* @see com.sk89q.worldedit.command.HistorySubCommands
* {@link com.sk89q.worldedit.command.HistorySubCommands}
*/
package com.sk89q.worldedit.command;
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/**
* The following classes are FAWE additions:
*
* @see com.sk89q.worldedit.command.util.annotation.AllowedRegion
* @see com.sk89q.worldedit.command.util.annotation.Confirm
* @see com.sk89q.worldedit.command.util.annotation.ConfirmHandler
* @see com.sk89q.worldedit.command.util.annotation.Link
* @see com.sk89q.worldedit.command.util.annotation.PatternList
* @see com.sk89q.worldedit.command.util.annotation.Preload
* @see com.sk89q.worldedit.command.util.annotation.PreloadHandler
* @see com.sk89q.worldedit.command.util.annotation.Step
* @see com.sk89q.worldedit.command.util.annotation.Time
* {@link com.sk89q.worldedit.command.util.annotation.AllowedRegion},
* {@link com.sk89q.worldedit.command.util.annotation.Confirm},
* {@link com.sk89q.worldedit.command.util.annotation.ConfirmHandler},
* {@link com.sk89q.worldedit.command.util.annotation.Link},
* {@link com.sk89q.worldedit.command.util.annotation.PatternList},
* {@link com.sk89q.worldedit.command.util.annotation.Preload},
* {@link com.sk89q.worldedit.command.util.annotation.PreloadHandler},
* {@link com.sk89q.worldedit.command.util.annotation.Step},
* {@link com.sk89q.worldedit.command.util.annotation.Time}
*/
package com.sk89q.worldedit.command.util.annotation;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* The following classes are FAWE additions:
*
* @see com.sk89q.worldedit.function.operation.BackwardsExtentBlockCopy
* {@link com.sk89q.worldedit.function.operation.BackwardsExtentBlockCopy}
*/
package com.sk89q.worldedit.function.operation;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* The following classes are FAWE additions:
*
* @see com.sk89q.worldedit.world.block.BlockTypesCache
* {@link com.sk89q.worldedit.world.block.BlockTypesCache}
*/
package com.sk89q.worldedit.world.block;
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* The following classes are FAWE additions:
*
* @see com.sk89q.worldedit.world.chunk.AnvilChunk15
* @see com.sk89q.worldedit.world.chunk.AnvilChunk17
* {@link com.sk89q.worldedit.world.chunk.AnvilChunk15},
* {@link com.sk89q.worldedit.world.chunk.AnvilChunk17}
*/
package com.sk89q.worldedit.world.chunk;

0 comments on commit 9f72054

Please sign in to comment.