diff --git a/src/main/java/droidicus/aquaregia/util/SwordUpgrades.java b/src/main/java/droidicus/aquaregia/util/SwordUpgrades.java
diff --git a/src/main/java/droidicus/aquaregia/world/biome/BiomeDesertTest.java b/src/main/java/droidicus/aquaregia/world/biome/BiomeDesertTest.java
diff --git a/src/main/java/droidicus/aquaregia/world/biome/package-info.java b/src/main/java/droidicus/aquaregia/world/biome/package-info.java
diff --git a/src/main/java/droidicus/aquaregia/world/gen/WorldGenBanner.java b/src/main/java/droidicus/aquaregia/world/gen/WorldGenBanner.java
diff --git a/src/main/java/droidicus/aquaregia/world/gen/WorldGenOres.java b/src/main/java/droidicus/aquaregia/world/gen/WorldGenOres.java
@@ -27,12 +27,12 @@ public void generate(Random random, int chunkX, int chunkZ, World world, IChunkG
 		switch (world.provider.getDimensionType()) {
 			case NETHER:
 				for (int i = 0; i < 16; i++) {
-					oreGenNether.generate(world, random, chunkPos.add(random.nextInt(16), random.nextInt(108) + 10, random.nextInt(16)));
+//					oreGenNether.generate(world, random, chunkPos.add(random.nextInt(16), random.nextInt(108) + 10, random.nextInt(16)));
 				}
 				break;
 			case THE_END:
 				for (int i = 0; i < 16; i++) {
-					oreGenEnd.generate(world, random, chunkPos.add(random.nextInt(16), random.nextInt(128), random.nextInt(16)));
+//					oreGenEnd.generate(world, random, chunkPos.add(random.nextInt(16), random.nextInt(128), random.nextInt(16)));
 				}
 				break;
 		}

diff --git a/src/main/java/droidicus/aquaregia/world/gen/structure/MapGenScatteredFeatureModBiomes.java b/src/main/java/droidicus/aquaregia/world/gen/structure/MapGenScatteredFeatureModBiomes.java
diff --git a/src/main/java/droidicus/aquaregia/world/gen/structure/package-info.java b/src/main/java/droidicus/aquaregia/world/gen/structure/package-info.java
diff --git a/src/main/resources/assets/aquaregia/blockstates/fluid.json b/src/main/resources/assets/aquaregia/blockstates/fluid.json
@@ -53,6 +53,55 @@
 					"fluid": "my_finite"
 				}
 			}
+		],
+		"neutral": [
+			{
+				"custom": {
+					"fluid": "neutral"
+				}
+			}
+		],
+		"h2so4": [
+			{
+				"custom": {
+					"fluid": "h2so4"
+				}
+			}
+		],
+		"haucl4": [
+			{
+				"custom": {
+					"fluid": "haucl4"
+				}
+			}
+		],
+		"hcl": [
+			{
+				"custom": {
+					"fluid": "hcl"
+				}
+			}
+		],
+		"hf": [
+			{
+				"custom": {
+					"fluid": "hf"
+				}
+			}
+		],
+		"hno3": [
+			{
+				"custom": {
+					"fluid": "hno3"
+				}
+			}
+		],
+		"hno3hcl": [
+			{
+				"custom": {
+					"fluid": "hno3hcl"
+				}
+			}
 		]
 	}
 }
diff --git a/src/main/resources/assets/aquaregia/lang/en_US.lang b/src/main/resources/assets/aquaregia/lang/en_US.lang
diff --git a/src/main/resources/assets/aquaregia/models/item/goldprecip.json b/src/main/resources/assets/aquaregia/models/item/goldprecip.json
@@ -0,0 +1,6 @@
+{
+	"parent": "aquaregia:item/simple_model",
+	"textures": {
+		"layer0": "aquaregia:items/goldprecip"
+	}
+}
diff --git a/src/main/resources/assets/aquaregia/models/item/niter.json b/src/main/resources/assets/aquaregia/models/item/niter.json
@@ -0,0 +1,6 @@
+{
+	"parent": "aquaregia:item/simple_model",
+	"textures": {
+		"layer0": "aquaregia:items/niter"
+	}
+}
diff --git a/src/main/resources/assets/aquaregia/models/item/salt.json b/src/main/resources/assets/aquaregia/models/item/salt.json
@@ -0,0 +1,6 @@
+{
+	"parent": "aquaregia:item/simple_model",
+	"textures": {
+		"layer0": "aquaregia:items/salt"
+	}
+}
diff --git a/src/main/resources/assets/aquaregia/models/item/sulfur.json b/src/main/resources/assets/aquaregia/models/item/sulfur.json
@@ -0,0 +1,6 @@
+{
+	"parent": "aquaregia:item/simple_model",
+	"textures": {
+		"layer0": "aquaregia:items/sulfur"
+	}
+}
diff --git a/...ia/textures/blocks/fluid_finite_still.png → ...a/textures/blocks/fluids/finite_still.png b/...ia/textures/blocks/fluid_finite_still.png → ...a/textures/blocks/fluids/finite_still.png
diff --git a/...ures/blocks/fluid_finite_still.png.mcmeta → ...res/blocks/fluids/finite_still.png.mcmeta b/...ures/blocks/fluid_finite_still.png.mcmeta → ...res/blocks/fluids/finite_still.png.mcmeta
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/h2so4_flow.png b/src/main/resources/assets/aquaregia/textures/blocks/fluids/h2so4_flow.png
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/h2so4_flow.png.mcmeta b/src/main/resources/assets/aquaregia/textures/blocks/fluids/h2so4_flow.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/h2so4_still.png b/src/main/resources/assets/aquaregia/textures/blocks/fluids/h2so4_still.png
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/h2so4_still.png.mcmeta b/src/main/resources/assets/aquaregia/textures/blocks/fluids/h2so4_still.png.mcmeta
@@ -0,0 +1,3 @@
+{
+  "animation": {}
+}
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/haucl4_flow.png b/src/main/resources/assets/aquaregia/textures/blocks/fluids/haucl4_flow.png
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/haucl4_flow.png.mcmeta b/src/main/resources/assets/aquaregia/textures/blocks/fluids/haucl4_flow.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/haucl4_still.png b/src/main/resources/assets/aquaregia/textures/blocks/fluids/haucl4_still.png
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/haucl4_still.png.mcmeta b/src/main/resources/assets/aquaregia/textures/blocks/fluids/haucl4_still.png.mcmeta
@@ -0,0 +1,3 @@
+{
+  "animation": {}
+}
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/hcl_flow.png b/src/main/resources/assets/aquaregia/textures/blocks/fluids/hcl_flow.png
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/hcl_flow.png.mcmeta b/src/main/resources/assets/aquaregia/textures/blocks/fluids/hcl_flow.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/hcl_still.png b/src/main/resources/assets/aquaregia/textures/blocks/fluids/hcl_still.png
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/hcl_still.png.mcmeta b/src/main/resources/assets/aquaregia/textures/blocks/fluids/hcl_still.png.mcmeta
@@ -0,0 +1,3 @@
+{
+  "animation": {}
+}
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/hf_flow.png b/src/main/resources/assets/aquaregia/textures/blocks/fluids/hf_flow.png
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/hf_flow.png.mcmeta b/src/main/resources/assets/aquaregia/textures/blocks/fluids/hf_flow.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/hf_still.png b/src/main/resources/assets/aquaregia/textures/blocks/fluids/hf_still.png
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/hf_still.png.mcmeta b/src/main/resources/assets/aquaregia/textures/blocks/fluids/hf_still.png.mcmeta
@@ -0,0 +1,3 @@
+{
+  "animation": {}
+}
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/hno3_flow.png b/src/main/resources/assets/aquaregia/textures/blocks/fluids/hno3_flow.png
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/hno3_flow.png.mcmeta b/src/main/resources/assets/aquaregia/textures/blocks/fluids/hno3_flow.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/hno3_still.png b/src/main/resources/assets/aquaregia/textures/blocks/fluids/hno3_still.png
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/hno3_still.png.mcmeta b/src/main/resources/assets/aquaregia/textures/blocks/fluids/hno3_still.png.mcmeta
@@ -0,0 +1,3 @@
+{
+  "animation": {}
+}
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/hno3hcl_flow.png b/src/main/resources/assets/aquaregia/textures/blocks/fluids/hno3hcl_flow.png
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/hno3hcl_flow.png.mcmeta b/src/main/resources/assets/aquaregia/textures/blocks/fluids/hno3hcl_flow.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/hno3hcl_still.png b/src/main/resources/assets/aquaregia/textures/blocks/fluids/hno3hcl_still.png
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/hno3hcl_still.png.mcmeta b/src/main/resources/assets/aquaregia/textures/blocks/fluids/hno3hcl_still.png.mcmeta
@@ -0,0 +1,3 @@
+{
+  "animation": {}
+}
diff --git a/.../textures/blocks/fluid_my_finite_flow.png → ...textures/blocks/fluids/my_finite_flow.png b/.../textures/blocks/fluid_my_finite_flow.png → ...textures/blocks/fluids/my_finite_flow.png
diff --git a/...es/blocks/fluid_my_finite_flow.png.mcmeta → ...s/blocks/fluids/my_finite_flow.png.mcmeta b/...es/blocks/fluid_my_finite_flow.png.mcmeta → ...s/blocks/fluids/my_finite_flow.png.mcmeta
diff --git a/...textures/blocks/fluid_my_finite_still.png → ...extures/blocks/fluids/my_finite_still.png b/...textures/blocks/fluid_my_finite_still.png → ...extures/blocks/fluids/my_finite_still.png
diff --git a/...s/blocks/fluid_my_finite_still.png.mcmeta → .../blocks/fluids/my_finite_still.png.mcmeta b/...s/blocks/fluid_my_finite_still.png.mcmeta → .../blocks/fluids/my_finite_still.png.mcmeta
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/neutral_flow.png b/src/main/resources/assets/aquaregia/textures/blocks/fluids/neutral_flow.png
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/neutral_flow.png.mcmeta b/src/main/resources/assets/aquaregia/textures/blocks/fluids/neutral_flow.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/neutral_still.png b/src/main/resources/assets/aquaregia/textures/blocks/fluids/neutral_still.png
diff --git a/src/main/resources/assets/aquaregia/textures/blocks/fluids/neutral_still.png.mcmeta b/src/main/resources/assets/aquaregia/textures/blocks/fluids/neutral_still.png.mcmeta
@@ -0,0 +1,3 @@
+{
+  "animation": {}
+}
diff --git a/...gia/textures/blocks/fluid_normal_flow.png → ...ia/textures/blocks/fluids/normal_flow.png b/...gia/textures/blocks/fluid_normal_flow.png → ...ia/textures/blocks/fluids/normal_flow.png
diff --git a/...tures/blocks/fluid_normal_flow.png.mcmeta → ...ures/blocks/fluids/normal_flow.png.mcmeta b/...tures/blocks/fluid_normal_flow.png.mcmeta → ...ures/blocks/fluids/normal_flow.png.mcmeta
diff --git a/...textures/blocks/fluid_normal_gas_flow.png → ...extures/blocks/fluids/normal_gas_flow.png b/...textures/blocks/fluid_normal_gas_flow.png → ...extures/blocks/fluids/normal_gas_flow.png
diff --git a/...s/blocks/fluid_normal_gas_flow.png.mcmeta → .../blocks/fluids/normal_gas_flow.png.mcmeta b/...s/blocks/fluid_normal_gas_flow.png.mcmeta → .../blocks/fluids/normal_gas_flow.png.mcmeta
diff --git a/...extures/blocks/fluid_normal_gas_still.png → ...xtures/blocks/fluids/normal_gas_still.png b/...extures/blocks/fluid_normal_gas_still.png → ...xtures/blocks/fluids/normal_gas_still.png
diff --git a/.../blocks/fluid_normal_gas_still.png.mcmeta → ...blocks/fluids/normal_gas_still.png.mcmeta b/.../blocks/fluid_normal_gas_still.png.mcmeta → ...blocks/fluids/normal_gas_still.png.mcmeta
diff --git a/...ia/textures/blocks/fluid_normal_still.png → ...a/textures/blocks/fluids/normal_still.png b/...ia/textures/blocks/fluid_normal_still.png → ...a/textures/blocks/fluids/normal_still.png
diff --git a/...ures/blocks/fluid_normal_still.png.mcmeta → ...res/blocks/fluids/normal_still.png.mcmeta b/...ures/blocks/fluid_normal_still.png.mcmeta → ...res/blocks/fluids/normal_still.png.mcmeta
diff --git a/...blocks/fluid_portal_displacement_flow.png → ...locks/fluids/portal_displacement_flow.png b/...blocks/fluid_portal_displacement_flow.png → ...locks/fluids/portal_displacement_flow.png
diff --git a/...fluid_portal_displacement_flow.png.mcmeta → ...luids/portal_displacement_flow.png.mcmeta b/...fluid_portal_displacement_flow.png.mcmeta → ...luids/portal_displacement_flow.png.mcmeta
diff --git a/...locks/fluid_portal_displacement_still.png → ...ocks/fluids/portal_displacement_still.png b/...locks/fluid_portal_displacement_still.png → ...ocks/fluids/portal_displacement_still.png
diff --git a/...luid_portal_displacement_still.png.mcmeta → ...uids/portal_displacement_still.png.mcmeta b/...luid_portal_displacement_still.png.mcmeta → ...uids/portal_displacement_still.png.mcmeta
diff --git a/...extures/blocks/fluid_static_gas_still.png → ...xtures/blocks/fluids/static_gas_still.png b/...extures/blocks/fluid_static_gas_still.png → ...xtures/blocks/fluids/static_gas_still.png
diff --git a/.../blocks/fluid_static_gas_still.png.mcmeta → ...blocks/fluids/static_gas_still.png.mcmeta b/.../blocks/fluid_static_gas_still.png.mcmeta → ...blocks/fluids/static_gas_still.png.mcmeta
diff --git a/...ia/textures/blocks/fluid_static_still.png → ...a/textures/blocks/fluids/static_still.png b/...ia/textures/blocks/fluid_static_still.png → ...a/textures/blocks/fluids/static_still.png
diff --git a/...ures/blocks/fluid_static_still.png.mcmeta → ...res/blocks/fluids/static_still.png.mcmeta b/...ures/blocks/fluid_static_still.png.mcmeta → ...res/blocks/fluids/static_still.png.mcmeta
diff --git a/src/main/resources/assets/aquaregia/textures/items/goldprecip.png b/src/main/resources/assets/aquaregia/textures/items/goldprecip.png
diff --git a/src/main/resources/assets/aquaregia/textures/items/niter.png b/src/main/resources/assets/aquaregia/textures/items/niter.png
diff --git a/src/main/resources/assets/aquaregia/textures/items/salt.png b/src/main/resources/assets/aquaregia/textures/items/salt.png
diff --git a/src/main/resources/assets/aquaregia/textures/items/sulfur.png b/src/main/resources/assets/aquaregia/textures/items/sulfur.png