Merge remote-tracking branch 'upstream/master' into 0908-merge
This commit is contained in:
@@ -79,8 +79,8 @@ subprojects {
|
||||
uploadArchives {
|
||||
repositories {
|
||||
mavenDeployer {
|
||||
repository(url: System.getenv("NEXUS-URL")) {
|
||||
authentication(userName: System.getenv("NEXUS-USER"), password: System.getenv("NEXUS-PASSWORD"))
|
||||
repository(url: System.getenv("NEXUS_URL")) {
|
||||
authentication(userName: System.getenv("NEXUS_USER"), password: System.getenv("NEXUS_PASSWORD"))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1265,6 +1265,14 @@ public class MenuEntrySwapperPlugin extends Plugin
|
||||
if (this.swapBirdhouseEmpty)
|
||||
{
|
||||
menuManager.addPriorityEntry("Empty", "Birdhouse");
|
||||
menuManager.addPriorityEntry("Empty", "Oak Birdhouse");
|
||||
menuManager.addPriorityEntry("Empty", "Willow Birdhouse");
|
||||
menuManager.addPriorityEntry("Empty", "Teak Birdhouse");
|
||||
menuManager.addPriorityEntry("Empty", "Maple Birdhouse");
|
||||
menuManager.addPriorityEntry("Empty", "Mahogany Birdhouse");
|
||||
menuManager.addPriorityEntry("Empty", "Yew Birdhouse");
|
||||
menuManager.addPriorityEntry("Empty", "Magic Birdhouse");
|
||||
menuManager.addPriorityEntry("Empty", "Redwood Birdhouse");
|
||||
}
|
||||
|
||||
if (this.swapQuick)
|
||||
@@ -1565,6 +1573,14 @@ public class MenuEntrySwapperPlugin extends Plugin
|
||||
menuManager.removePriorityEntry("Activate", "Box trap");
|
||||
menuManager.removePriorityEntry("Chase");
|
||||
menuManager.removePriorityEntry("Empty", "Birdhouse");
|
||||
menuManager.removePriorityEntry("Empty", "Oak Birdhouse");
|
||||
menuManager.removePriorityEntry("Empty", "Willow Birdhouse");
|
||||
menuManager.removePriorityEntry("Empty", "Teak Birdhouse");
|
||||
menuManager.removePriorityEntry("Empty", "Maple Birdhouse");
|
||||
menuManager.removePriorityEntry("Empty", "Mahogany Birdhouse");
|
||||
menuManager.removePriorityEntry("Empty", "Yew Birdhouse");
|
||||
menuManager.removePriorityEntry("Empty", "Magic Birdhouse");
|
||||
menuManager.removePriorityEntry("Empty", "Redwood Birdhouse");
|
||||
menuManager.removePriorityEntry("Quick-enter");
|
||||
menuManager.removePriorityEntry("Quick-start");
|
||||
menuManager.removePriorityEntry("Quick-pass");
|
||||
|
||||
Reference in New Issue
Block a user