Merge branch 'develop' into j_develop_statsheet

RPTools · Oct 18, 2024 · d289468 · d289468
2 parents 2b9b98b + ec9e905
commit d289468
Show file tree

Hide file tree

Showing 39 changed files with 159 additions and 3,045 deletions.
diff --git a/build.gradle b/build.gradle
@@ -485,9 +485,6 @@ dependencies {
     // Built In Add-on Libraries
     implementation 'com.github.RPTools:maptool-builtin-addons:1.3'
 
-    // File watcher library to work around some inconsistencies with java.nio.file.WatchService
-    implementation 'io.methvin:directory-watcher:0.18.0'
-
     // For advanced dice roller
     implementation 'com.github.RPTools:advanced-dice-roller:1.0.3'
 }

diff --git a/src/main/java/net/rptools/maptool/client/AppPreferences.java b/src/main/java/net/rptools/maptool/client/AppPreferences.java
@@ -393,15 +393,6 @@ public class AppPreferences {
 
   public static final Preference<String> iconTheme = StringType.create("iconTheme", "Rod Takehara");
 
-  public static final Preference<String> externalAddOnLibrariesPath =
-      StringType.create("externalAddOnLibrariesPath", null);
-
-  public static final Preference<Boolean> externalAddOnLibrariesEnabled =
-      BooleanType.create("externalAddOnLibrariesEnabled", false);
-
-  public static final Preference<String> createAddOnParentDir =
-      StringType.create("createAddOnParentDir", System.getProperty("user.home"));
-
   static {
     // Used to be stored as separate components but now is one color. Add if not already there.
     if (prefs.get("trustedPrefixFG", null) == null) {

diff --git a/src/main/java/net/rptools/maptool/client/ui/addon/AddOnLibrariesDialogView.form b/src/main/java/net/rptools/maptool/client/ui/addon/AddOnLibrariesDialogView.form