Merge pull request #233 from PrisonTeam/release_branch.v3.3.0-alpha.12

Release branch.v3.3.0 alpha.12
PrisonTeam · Jun 28, 2022 · 150e6dc · 150e6dc
2 parents 1a8072c + df4b26c
commit 150e6dc
Show file tree

Hide file tree

Showing 323 changed files with 24,556 additions and 10,981 deletions.
diff --git a/.gitignore b/.gitignore
@@ -130,3 +130,4 @@ gradle-app.setting
 # gradle/wrapper/gradle-wrapper.properties
 
 build.gradle.deploy
+prison-spigot/lib/old/
diff --git a/build.gradle b/build.gradle
@@ -119,16 +119,25 @@ subprojects {
 
     repositories {
         mavenCentral()
-        maven { url "https://maven.sk89q.com/repo/" }
-        maven { url "https://mvnrepository.com/artifact/org.apache.commons/commons-lang3" }
+       // maven { url "https://maven.sk89q.com/repo/" }
+
+        maven { 
+        	url "https://mvnrepository.com/artifact/org.apache.commons/commons-lang3" 
+        	content {
+    			includeGroup 'org.apache.commons'
+    		}
+        }
+
     }
+
 
     configurations {
         deployerJars
     }
 
     dependencies {
         implementation 'org.apache.commons:commons-lang3:3.12.0'
+
         implementation 'com.google.guava:guava:19.0'
         implementation 'com.google.code.gson:gson:2.8.6'
         testImplementation 'junit:junit:4.12'

diff --git a/docs/changelog_v3.3.x.md b/docs/changelog_v3.3.x.md
diff --git a/docs/images/prison_docs_030_1_LP_add_a_group.png b/docs/images/prison_docs_030_1_LP_add_a_group.png
diff --git a/docs/images/prison_docs_030_2_LP_create_group_a.png b/docs/images/prison_docs_030_2_LP_create_group_a.png
diff --git a/docs/images/prison_docs_030_3_LP_create_group_b.png b/docs/images/prison_docs_030_3_LP_create_group_b.png
diff --git a/docs/images/prison_docs_030_4_LP_create_track_mine-ranks.png b/docs/images/prison_docs_030_4_LP_create_track_mine-ranks.png
diff --git a/docs/images/prison_docs_030_5_LP_edit_track-mine-ranks.png b/docs/images/prison_docs_030_5_LP_edit_track-mine-ranks.png
Original file line number	Diff line number	Diff line change
Expand Up		@@ -130,3 +130,4 @@ gradle-app.setting
		# gradle/wrapper/gradle-wrapper.properties

		build.gradle.deploy
		prison-spigot/lib/old/