Merge branch 'hotfix/v1.1.1'

UndeadZeratul · Sep 15, 2016 · 55ad078 · 55ad078
2 parents cc10b2c + 9f0be17
commit 55ad078
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/common/base/config/SpiceOfLife.cfg b/common/base/config/SpiceOfLife.cfg
@@ -76,12 +76,12 @@ server {
     # The maximum time it takes to eat a food after being modified by food.eating.speed.modifier
     # The default eating duration is 32. Set this to 0 to remove the limit on eating speed.
     # Note: If this is set to 0 and food.eating.speed.modifier is > 0, a food with 0% nutrtional value will take nearly infinite time to eat
-    I:food.eating.duration.max=64
+    I:food.eating.duration.max=32
 
     # If set to greater than zero, food eating speed will be affected by nutritional value
     # (meaning the lower the nutrtional value, the longer it will take to eat it)
     # Eating duration is calcualted using the formula (eating_duration / (nutritional_value^eating_speed_modifier))
-    D:food.eating.speed.modifier=1.0
+    D:food.eating.speed.modifier=0
 
     # The maximum amount of eaten foods stored in the history at a time
     I:food.history.length=64

diff --git a/common/base/config/SpiceOfLife/Fruits.json b/common/base/config/SpiceOfLife/Fruits.json
@@ -2,8 +2,8 @@
 	"name": "Fruits",
 	"food": {
 		"oredict": [
-			"listAllfruit",
-			"listAllberry"
+			"listAllberry",
+			"listAllfruit"
 		]
 	}
 }
diff --git a/common/base/config/SpiceOfLife/Vegetables.json b/common/base/config/SpiceOfLife/Vegetables.json
@@ -2,6 +2,8 @@
 	"name": "Vegetables",
 	"food": {
 		"oredict": [
+			"listAllrootveggie",
+			"listAllvegetable",
 			"listAllveggie"
 		]
 	}

diff --git a/common/base/config/twbbtweaks.cfg b/common/base/config/twbbtweaks.cfg
@@ -583,6 +583,9 @@ general {
             listAllturkeyraw|listAllmeatraw
             listAllvenisoncooked|listAllmeatcooked
             listAllvenisonraw|listAllmeatraw
+            listAllrootveggie|listAllveggie
+            listAllvegetable|listAllveggie
+            listAllveggie|listAllvegetable
             cropAvacado|listAllfood
             cropMelon|listAllfood
             cropRice|listAllfood

diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.undeadzeratul</groupId>
 	<artifactId>TWBB</artifactId>
-	<version>1.1.0</version>
+	<version>1.1.1</version>
 	<name>There Will Be Blood</name>
 	<url>http://maven.apache.org</url>
 	<packaging>pom</packaging>