Merge remote-tracking branch 'origin/master'

sayterdarkwynd · Sep 11, 2016 · 725b3ec · 725b3ec
2 parents 993565c + 21fcaea
commit 725b3ec
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/items/bees/other/beesilk.item b/items/bees/other/beesilk.item
@@ -5,5 +5,6 @@
   "dropCollision" : [-2.5, -2.0, 2.5, 2.0],
   "description" : "Strands of sticky silk! Craft with them!",
   "shortdescription" : "Bee Silk",
-  "learnBlueprintsOnPickup" : [ "fuhoneysilkbandage", "goldenfleece" ]
+  "learnBlueprintsOnPickup" : [ "fuhoneysilkbandage", "goldenfleece" ],
+  "itemTags" : [ "reagent" ]
 }
diff --git a/items/generic/crafting/fissionfurnace/fuamberchunk.item b/items/generic/crafting/fissionfurnace/fuamberchunk.item
@@ -6,7 +6,11 @@
   "inventoryIcon" : "fuamberchunk.png",
   "description" : "A chunk of solid amber.",
   "shortdescription" : "Amber Chunk",
-  "learnBlueprintsOnPickup" : [ "fuamberchunk", "fulightpriestchest", "fulightpriesthead", "fulightpriestpants",
+  "learnBlueprintsOnPickup" : [ 
+  "fuamberchunk", 
+  "fulightpriestchest", 
+  "fulightpriesthead", 
+  "fulightpriestpants",
   "fuambersword",
   "fugoldenblade",
   "fuhoneyhammer"

diff --git a/objects/bees/beestation/beestation.object b/objects/bees/beestation/beestation.object
@@ -7,7 +7,7 @@
     "config" : "/interface/windowconfig/beestation.config",
     "filter" : [ "beestation" ]
   },
-  "learnBlueprintsOnPickup" : [ "normalalveary", "normalapiary", "beerefuge", "honeytable", "bees_woodencentrifuge", "honeytable", "honeyextractor"],
+  "learnBlueprintsOnPickup" : [ "normalalveary", "normalapiary", "beerefuge", "honeytable", "bees_woodencentrifuge", "honeytable", "honeyextractor", "basicframe"],
   "printable" : false,
   "description" : "Craft all sorts of bee related items!",
   "shortdescription" : "^orange;Apiary Crafting Station^white;",

diff --git a/objects/generic/extractionlab_common.lua b/objects/generic/extractionlab_common.lua
@@ -387,7 +387,7 @@ function getRecipes()
 	{ inputs = { sandstonematerial = 50 }, outputs = { phosphorus = { 1, 1, 2 } } },
 	{ inputs = { sewage = 50 }, outputs = { poop = { 2, 2, 4 } } },
 	{ inputs = { shadowblock = 50 }, outputs = { rawminerals = { 3, 4, 5 } } },
-	{ inputs = { shadowspikeblock = 50 }, outputs = { rawminerals = { 3, 4, 53 } } },
+	{ inputs = { shadowspikeblock = 50 }, outputs = { rawminerals = { 3, 4, 5 } } },
 	{ inputs = { shadowwallblock = 50 }, outputs = { rawminerals = { 3, 4, 5 } } },
 	{ inputs = { shroomblock = 50 }, outputs = { geneticmaterial = { 2, 2, 4 } } },
 	{ inputs = { shroomblockglow = 50 }, outputs = { agaranichor = { 1, 1, 4 } } },
@@ -396,7 +396,7 @@ function getRecipes()
 	{ inputs = { slimedirtmaterial = 50 }, outputs = { tissueculture = { 3, 3, 4 } } },
 	{ inputs = { slush = 50 }, outputs = { nutrientpaste = { 1, 1, 2 } } },
 	{ inputs = { snow = 50 }, outputs = { nutrientpaste = { 2, 2, 4 } } },
-	{ inputs = { spidersilkblock = 50 }, outputs = { silk = { 1, 1, 3 } } },
+	{ inputs = { spidersilkblock = 50 }, outputs = { silkfibre = { 5, 7, 11 } } },
 	{ inputs = { springvines = 50 }, outputs = { geneticmaterial = { 1, 2, 3 } } },
 	{ inputs = { steelmetal = 50 }, outputs = { metalchunk = { 1, 1, 2 } } },
 	{ inputs = { steelpartblock = 50 }, outputs = { metalchunk = { 1, 1, 2 } } },

diff --git a/recipes/ff_stations/prototyper/fu_quantumgenerator.recipe b/recipes/ff_stations/prototyper/fu_quantumgenerator.recipe
@@ -1,6 +1,6 @@
 {
   "input" : [
-    { "item" : "isn_fissionreactor", "count" : 1 },
+    { "item" : "isn_fissionreactornew", "count" : 1 },
     { "item" : "nuclearcore", "count" : 2 },
     { "item" : "morphitebar", "count" : 6 },
     { "item" : "pyreitebar", "count" : 6 },