Merge pull request #46 from renbear67/master

Final batch of fixes
sayterdarkwynd · Jul 22, 2016 · aa16fe8 · aa16fe8
2 parents 6c0f4c2 + c6ccd71
commit aa16fe8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/interface/windowconfig/distill.config b/interface/windowconfig/distill.config
@@ -25,7 +25,7 @@
       "position" : [-5, 252],
       "icon" : {
         "type" : "image",
-        "file" : "/interface/crafting/anvil.png",
+        "file" : "/interface/crafting/craftinganvil.png",
         "position" : [0, -20],
         "zlevel" : -1
       }

diff --git a/interface/windowconfig/ferment.config b/interface/windowconfig/ferment.config
@@ -25,7 +25,7 @@
       "position" : [-5, 252],
       "icon" : {
         "type" : "image",
-        "file" : "/interface/crafting/anvil.png",
+        "file" : "/interface/crafting/craftinganvil.png",
         "position" : [0, -20],
         "zlevel" : -1
       }

diff --git a/interface/windowconfig/mash.config b/interface/windowconfig/mash.config
@@ -25,7 +25,7 @@
       "position" : [-5, 252],
       "icon" : {
         "type" : "image",
-        "file" : "/interface/crafting/anvil.png",
+        "file" : "/interface/crafting/craftinganvil.png",
         "position" : [0, -20],
         "zlevel" : -1
       }

diff --git a/monsters/generated/ground/largebiped/default.frames b/monsters/generated/ground/largebiped/default.frames
@@ -21,6 +21,7 @@
   	"walkbackwards.5" : "walk.4",
   	"walkbackwards.6" : "walk.3",
   	"walkbackwards.7" : "walk.2",
-  	"walkbackwards.8" : "walk.1"
+  	"walkbackwards.8" : "walk.1",
+	"idle.1" : "idle"
   }
 }
diff --git a/objects/farmables/a_ise/quellstem/wildquellstem.object b/objects/farmables/a_ise/quellstem/wildquellstem.object
@@ -39,5 +39,8 @@
       "resetToStage" : 0
     }
   ],
-    "maxImmersion" : 0.125
-  }
+  "maxImmersion" : 0.125,
+  "breakDropOptions" : [
+    [ [ "quellstem", 1, { } ] ]
+  ]
+}