Merge pull request #59 from JerichoFletcher/v1.6

v1.6

README.md

@@ -18,4 +18,7 @@ Translators:
 - French - [feu-follet](https://github.com/feu-follet)
 
 Contributors:
-- [kapzduke](https://github.com/kapzduke)
+- [kapzduke](https://github.com/kapzduke)
+- [dsethlewis](https://github.com/dsethlewis)
+- GlitchyShipBoi a.k.a. [DatOnePlayer](https://github.com/DatOnePlayer)
+- [Gdeft](https://github.com/Gdeft)

content/blocks/conveyors/aluminum-conveyor.json

@@ -0,0 +1,11 @@
+type: Conveyor
+requirements: [
+	copper/1
+	lead/1
+	aluminum/1
+]
+health: 15
+category: distribution
+speed: 0.123
+displayedSpeed: 16
+research: titanium-conveyor

content/blocks/conveyors/iron-conveyor.json

@@ -0,0 +1,11 @@
+type: Conveyor
+requirements: [
+	copper/1
+	lead/1
+	iron/1
+]
+health: 55
+category: distribution
+speed: 0.0538
+displayedSpeed: 7
+research: router

content/blocks/defense/fire-aura.json

@@ -1,6 +1,7 @@
 size: 2
 health: 320
 powerUse: 1.5
+outlineIcon: false
 activeSound: fireAuraActive
 requirements: [
   lead/125
@@ -9,4 +10,4 @@ requirements: [
   phase-fabric/25
 ]
 category: effect
-research: mend-projector
+research: force-projector

content/blocks/defense/frost-aura.json

@@ -0,0 +1,13 @@
+size: 2
+health: 320
+powerUse: 1.5
+outlineIcon: false
+//activeSound: fireAuraActive
+requirements: [
+  silicon/150
+  steel/50
+  metaglass/60
+  phase-fabric/20
+]
+category: effect
+research: fire-aura

content/blocks/defense/slag-bomb.json

@@ -0,0 +1,11 @@
+health: 40
+tileDamage: 1000
+baseExplosiveness: 3
+hasShadow: false
+requirements: [
+	copper/20
+	metaglass/8
+	scrap-plate/15
+]
+category: effect
+research: shock-mine

content/blocks/drills/adv-water-extractor.json

@@ -0,0 +1,17 @@
+type: SolidPump
+size: 1
+health: 150
+liquidCapacity: 10
+consumes: {
+	power: 3
+}
+requirements: [
+	copper/100
+	graphite/100
+	lead/ 80
+	steel/20
+]
+category: production
+research: quarry
+attribute: water
+pumpAmount: 0.25

content/blocks/drills/crusher-drill.json

@@ -0,0 +1,20 @@
+size: 1
+tier: 2
+drillTime: 300
+drawMineItem: false
+updateEffect: pulverizeSmall
+drillEffect: mine
+consumes: {
+  liquid: {
+  	liquid: water
+  	amount: 0.03
+  	optional: true
+  	booster: true
+  }
+}
+requirements: [
+  copper/4
+  scrap-plate/2
+]
+category: production
+research: laser-drill

content/blocks/drills/magnetic-sieve.json

@@ -0,0 +1,23 @@
+size: 2
+hasItems: true
+hasPower: true
+craftTime: 20
+itemCapacity: 20
+consumes: {
+  power: 2
+}
+results: [
+  sand/19
+  iron/1
+]
+requirements: [
+  copper/50
+  aluminum/25
+  scrap-plate/25
+  iron/50
+  plastanium/15
+]
+category: production
+research: quarry
+idleSound: spark
+idleSoundVolume: 0.003

content/blocks/environments/contaminated-water.json

@@ -0,0 +1,11 @@
+type: Floor
+liquidDrop: liquid-contaminated-water
+speedMultiplier: 0.5
+variants: 0
+isLiquid: true
+status: wet
+statusDuration: 90
+drownUpdateEffect: burning
+walkEffect: wet
+blendGroup: water
+cacheLayer: water

content/blocks/environments/darksand-contaminated-water.json

@@ -0,0 +1,11 @@
+type: Floor
+liquidDrop: liquid-contaminated-water
+speedMultiplier: 0.5
+variants: 0
+isLiquid: true
+status: wet
+statusDuration: 90
+drownUpdateEffect: burning
+walkEffect: wet
+blendGroup: water
+cacheLayer: water

content/blocks/environments/deep-contaminated-water.json

@@ -0,0 +1,12 @@
+type: Floor
+liquidDrop: liquid-contaminated-water
+speedMultiplier: 0.2
+variants: 0
+isLiquid: true
+status: wet
+statusDuration: 120
+drownUpdateEffect: burning
+walkEffect: wet
+blendGroup: water
+cacheLayer: water
+drownTime: 140

content/blocks/environments/ore-aluminum.json

@@ -0,0 +1,5 @@
+type: OreBlock
+itemDrop: aluminum
+oreDefault: true
+oreThreshold: 0.89
+oreScale: 25.828543

content/blocks/environments/sand-contaminated-water.json

@@ -0,0 +1,11 @@
+type: Floor
+liquidDrop: liquid-contaminated-water
+speedMultiplier: 0.5
+variants: 0
+isLiquid: true
+status: wet
+statusDuration: 90
+drownUpdateEffect: burning
+walkEffect: wet
+blendGroup: water
+cacheLayer: water

content/blocks/liquid/liquid-container.json

@@ -0,0 +1,10 @@
+type: LiquidTank
+health: 250
+size: 2
+liquidCapacity: 650
+requirements: [
+  metaglass/12
+  titanium/12
+]
+category: liquid
+research: liquid-router

content/blocks/power/liquid-combustion-engine.json

@@ -0,0 +1,16 @@
+size: 2
+hasItems: false
+hasLiquids: true
+minLiquidEfficiency: 0.2
+maxLiquidGenerate: 0.08
+powerProduction: 3
+generateEffect: redgeneratespark
+heatColor: ff9b59
+requirements: [
+	titanium/75
+	silicon/50
+	iron/50
+	metaglass/25
+]
+category: power
+research: turbine-generator

content/blocks/power/power-amplifier.json

@@ -0,0 +1,17 @@
+size: 2
+craftTime: 60
+consumes: {
+	items: {
+		items: [
+			coil/1
+		]
+	}
+}
+requirements: [
+	lead/85
+	silicon/125
+	insulator-alloy/60
+	metaglass/50
+]
+category: power
+research: diode

content/blocks/power/spotlight.json

@@ -0,0 +1,13 @@
+outlineIcon: true
+health: 200
+consumes: {
+	power: 0.08
+}
+expanded: true
+requirements: [
+	graphite/10
+	silicon/4
+]
+category: effect
+buildVisibility: lightingOnly
+research: mender

content/blocks/production/chemical-station.json

@@ -9,13 +9,15 @@ updateEffect: producesmoke
 consumes: {
   power: 3
   items: {
-    items: [
-	  iron/2
+	items: [
+	  sulfur/1
 	]
   }
   liquid: {
-    liquid: liquid-gas
-	amount: 0.4
+    liquid: water
+	amount: 0.25
+	optional: false
+	booster: false
   }
 }
 outputLiquid: {

content/blocks/production/coil-winder.json

@@ -0,0 +1,21 @@
+size: 2
+hasPower: true
+hasItems: true
+craftTime: 60
+consumes: {
+	power: 1.4
+	items: {
+		items: [
+			copper/2
+			plastanium/1
+		]
+	}
+}
+outputItem: coil/1
+requirements: [
+	lead/60
+	silicon/75
+	aluminum/45
+]
+category: crafting
+research: steel-crucible

content/blocks/production/dissolver.json

@@ -0,0 +1,32 @@
+size: 3
+update: true
+hasPower: true
+hasItems: false
+hasLiquids: true
+craftTime: 60
+consumes: {
+	power: 3
+	items: {
+		items: [
+			uranium/1
+		]
+	}
+	liquid: {
+		liquid: water
+		amount: 0.6
+		optional: false
+		booster: false
+	}
+}
+outputLiquid:  {
+	liquid: liquid-contaminated-water
+}
+requirements: [
+	metaglass/50
+	silicon/95
+	graphite/100
+	steel/85
+	thorium/50
+]
+category: crafting
+research: polluter

content/blocks/production/insulating-compound.json

@@ -0,0 +1,25 @@
+size: 2
+hasPower: true
+hasItems: true
+hasLiquids: false
+craftTime: 85
+update: true
+consumes: {
+	items: {
+		items: [
+			plastanium/2
+			surge-alloy/1
+		]
+	}
+	power: 4.5
+}
+outputItem: insulator-alloy/1
+requirements: [
+	lead/75
+	titanium/50
+	uranium/25
+	surge-alloy/50
+	plastanium/30
+]
+category: crafting
+research: steel-crucible

content/blocks/production/molecular-dissipator.json

@@ -0,0 +1,21 @@
+size: 4
+hasPower: true
+hasLiquids: false
+craftTime: 60
+update: true
+consumes: {
+	items: {
+		items: [
+			radioactive-spore-pod/1
+		]
+	}
+	power: 18
+}
+requirements: [
+	lead/100
+	silicon/120
+	uranium/80
+	aluminum/80
+]
+category: crafting
+research: dissolver