Merge remote-tracking branch 'origin/master' into fabric/master

# Conflicts: # .github/workflows/release.yml
2020-08-18 00:20:46 +02:00
parent 739277ab64 7e1bfdb5ac
commit 74480502b1
6 changed files with 50 additions and 3 deletions
@@ -210,6 +210,14 @@ publishing {
            name = "GitHubPackages"
            url = "https://maven.pkg.github.com/AppliedEnergistics/Applied-Energistics-2"
        }
+        maven {
+            credentials {
+                username System.getenv("MODMAVEN_USER")
+                password System.getenv("MODMAVEN_PASSWORD")
+            }
+            name = "modmaven"
+            url = "https://modmaven.k-4u.nl/artifactory/local-releases/"
+        }
    }

 }