Merge pull request #338 from Team-RTG/dev

Merge 0.3.0 dev into master.
Team-RTG · Dec 13, 2015 · 83799e6 · 83799e6
2 parents 9831a45 + a191a4e
commit 83799e6
Show file tree

Hide file tree

Showing 246 changed files with 8,331 additions and 5,770 deletions.
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "0.2.0"
+version = "0.3.0"
 group = "org.teamrtg.rtg" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "RTG-" + project.mcversion
 

diff --git a/config/RTG/biomes/arsmagica.cfg b/config/RTG/biomes/arsmagica.cfg
@@ -20,7 +20,7 @@ villages {
 
 
 weights {
-    #  [range: 0 ~ 20, default: 15]
+    #  [range: 0 ~ 100, default: 15]
     I:"Weight of AM Witchwood Forest"=15
 }
 

diff --git a/config/RTG/biomes/atg.cfg b/config/RTG/biomes/atg.cfg
@@ -62,28 +62,28 @@ villages {
 
 
 weights {
-    #  [range: 0 ~ 20, default: 5]
+    #  [range: 0 ~ 100, default: 5]
     I:"Weight of ATG Gravel Beach"=5
 
-    #  [range: 0 ~ 20, default: 10]
+    #  [range: 0 ~ 100, default: 10]
     I:"Weight of ATG Rocky Steppe"=10
 
-    #  [range: 0 ~ 20, default: 10]
+    #  [range: 0 ~ 100, default: 10]
     I:"Weight of ATG Shrubland"=10
 
-    #  [range: 0 ~ 20, default: 5]
+    #  [range: 0 ~ 100, default: 5]
     I:"Weight of ATG Snowy Gravel Beach"=5
 
-    #  [range: 0 ~ 20, default: 10]
+    #  [range: 0 ~ 100, default: 10]
     I:"Weight of ATG Tropical Shrubland"=10
 
-    #  [range: 0 ~ 20, default: 10]
+    #  [range: 0 ~ 100, default: 10]
     I:"Weight of ATG Tundra"=10
 
-    #  [range: 0 ~ 20, default: 1]
+    #  [range: 0 ~ 100, default: 1]
     I:"Weight of ATG Volcano"=1
 
-    #  [range: 0 ~ 20, default: 10]
+    #  [range: 0 ~ 100, default: 10]
     I:"Weight of ATG Woodland"=10
 }
 

diff --git a/config/RTG/biomes/biomesoplenty.cfg b/config/RTG/biomes/biomesoplenty.cfg
@@ -464,229 +464,229 @@ villages {
 
 
 weights {
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Alps"=8
 
-    #  [range: 0 ~ 20, default: 6]
+    #  [range: 0 ~ 100, default: 6]
     I:"Weight of BOP Alps Forest"=6
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Arctic"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Bamboo Forest"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Bayou"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Bog"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Boreal Forest"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Brushland"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Canyon"=8
 
-    #  [range: 0 ~ 20, default: 6]
+    #  [range: 0 ~ 100, default: 6]
     I:"Weight of BOP Canyon Ravine"=6
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Chaparral"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Cherry Blossom Grove"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Coniferous Forest"=8
 
-    #  [range: 0 ~ 20, default: 12]
+    #  [range: 0 ~ 100, default: 12]
     I:"Weight of BOP Coral Reef"=12
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Crag"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Dead Forest"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Dead Swamp"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Deciduous Forest"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Dense Forest"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Eucalyptus Forest"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Fen"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Flower Field"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Frost Forest"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Fungi Forest"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Garden"=8
 
-    #  [range: 0 ~ 20, default: 6]
+    #  [range: 0 ~ 100, default: 6]
     I:"Weight of BOP Glacier"=6
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Grassland"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Grove"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Heathland"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Highland"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Jade Cliffs"=8
 
-    #  [range: 0 ~ 20, default: 12]
+    #  [range: 0 ~ 100, default: 12]
     I:"Weight of BOP Kelp Forest"=12
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Land Of Lakes"=8
 
-    #  [range: 0 ~ 20, default: 6]
+    #  [range: 0 ~ 100, default: 6]
     I:"Weight of BOP Land Of Lakes Marsh"=6
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Lavender Fields"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Lush Desert"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Lush Swamp"=8
 
-    #  [range: 0 ~ 20, default: 6]
+    #  [range: 0 ~ 100, default: 6]
     I:"Weight of BOP Mangrove"=6
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Maple Woods"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Marsh"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Meadow"=8
 
-    #  [range: 0 ~ 20, default: 6]
+    #  [range: 0 ~ 100, default: 6]
     I:"Weight of BOP Meadow Forest"=6
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Moor"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Mountain"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Mystic Grove"=8
 
-    #  [range: 0 ~ 20, default: 6]
+    #  [range: 0 ~ 100, default: 6]
     I:"Weight of BOP Oasis"=6
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Ominous Woods"=8
 
-    #  [range: 0 ~ 20, default: 6]
+    #  [range: 0 ~ 100, default: 6]
     I:"Weight of BOP Orchard"=6
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Origin Valley"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Outback"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Prairie"=8
 
-    #  [range: 0 ~ 20, default: 6]
+    #  [range: 0 ~ 100, default: 6]
     I:"Weight of BOP Quagmire"=6
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Rainforest"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Redwood Forest"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Sacred Springs"=8
 
-    #  [range: 0 ~ 20, default: 6]
+    #  [range: 0 ~ 100, default: 6]
     I:"Weight of BOP Scrubland"=6
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Seasonal Forest"=8
 
-    #  [range: 0 ~ 20, default: 6]
+    #  [range: 0 ~ 100, default: 6]
     I:"Weight of BOP Seasonal Forest Clearing"=6
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Shield"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Shrubland"=8
 
-    #  [range: 0 ~ 20, default: 6]
+    #  [range: 0 ~ 100, default: 6]
     I:"Weight of BOP Silkglades"=6
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Sludgepit"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Snowy Coniferous Forest"=8
 
-    #  [range: 0 ~ 20, default: 6]
+    #  [range: 0 ~ 100, default: 6]
     I:"Weight of BOP Spruce Woods"=6
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Steppe"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Temperate Rainforest"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Thicket"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Tropical Rainforest"=8
 
-    #  [range: 0 ~ 20, default: 6]
+    #  [range: 0 ~ 100, default: 6]
     I:"Weight of BOP Tropics"=6
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Tundra"=8
 
-    #  [range: 0 ~ 20, default: 1]
+    #  [range: 0 ~ 100, default: 1]
     I:"Weight of BOP Volcano"=1
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Wasteland"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Wetland"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Woodland"=8
 
-    #  [range: 0 ~ 20, default: 8]
+    #  [range: 0 ~ 100, default: 8]
     I:"Weight of BOP Xeric Shrubland"=8
 }
 

diff --git a/config/RTG/biomes/buildcraft.cfg b/config/RTG/biomes/buildcraft.cfg
@@ -26,10 +26,10 @@ villages {
 
 
 weights {
-    #  [range: 0 ~ 20, default: 1]
+    #  [range: 0 ~ 100, default: 1]
     I:"Weight of BC Desert Oil Field"=1
 
-    #  [range: 0 ~ 20, default: 1]
+    #  [range: 0 ~ 100, default: 1]
     I:"Weight of BC Ocean Oil Field"=1
 }
 

diff --git a/config/RTG/biomes/chromaticraft.cfg b/config/RTG/biomes/chromaticraft.cfg
@@ -26,10 +26,10 @@ villages {
 
 
 weights {
-    #  [range: 0 ~ 20, default: 10]
+    #  [range: 0 ~ 100, default: 10]
     I:"Weight of CC Ender Forest"=10
 
-    #  [range: 0 ~ 20, default: 10]
+    #  [range: 0 ~ 100, default: 10]
     I:"Weight of CC Rainbow Forest"=10
 }