update to upstream

2025-08-02 16:48:58 +08:00
parent bfe44b43bd
commit af17732b51
2814 changed files with 29788 additions and 17408 deletions
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "acacia_resin"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,16 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "textures": {
+      "texture": "contenttweaker:blocks/apostle_mycelium",
+      "particle": "contenttweaker:blocks/apostle_mycelium"
+    },
+    "model": "base:storage",
+    "uvlock": true,
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "bewitched_tincture"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "birch_soul"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "blazing_tincture"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,16 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "textures": {
+      "texture": "contenttweaker:blocks/bound_lunar_stone",
+      "particle": "contenttweaker:blocks/bound_lunar_stone"
+    },
+    "model": "base:storage",
+    "uvlock": true,
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "cleansing_balm"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "cloudy_oil"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "converging_recursive_essence"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "coquina_tincture"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "demonic_elixir"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "demonic_remains"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "demonic_tincture"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "dimensional_tincture"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "dragon_tincture"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "droplet_of_wisdom"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "ebb_of_death"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "ender_tincture"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "essence_of_vitality"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "eyrie_tincture"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "fiery_unguent"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "fishy_tincture"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "fractal_recursive_essence"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,16 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "textures": {
+      "texture": "contenttweaker:blocks/fracturing_stone",
+      "particle": "contenttweaker:blocks/fracturing_stone"
+    },
+    "model": "base:storage",
+    "uvlock": true,
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "garlic_tincture"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "glowing_tincture"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "gravel_tincture"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "gunpowder_tincture"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "heaven_extract"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,16 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "textures": {
+      "texture": "contenttweaker:blocks/hostile_neural_network",
+      "particle": "contenttweaker:blocks/hostile_neural_network"
+    },
+    "model": "base:storage",
+    "uvlock": true,
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{}]
+  }
+}
@@ -0,0 +1,16 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "textures": {
+      "texture": "contenttweaker:blocks/hyperuranion_actualizer_silkyjewel",
+      "particle": "contenttweaker:blocks/hyperuranion_actualizer_silkyjewel"
+    },
+    "model": "base:storage",
+    "uvlock": true,
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "iron_tincture"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "liquid_witchcraft"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "markov_recursive_essence"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "matter_of_restraining"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "molten_demonic_ember"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "molten_insanium"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,16 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "textures": {
+      "texture": "contenttweaker:blocks/mythic_coil_t4",
+      "particle": "contenttweaker:blocks/mythic_coil_t4"
+    },
+    "model": "base:storage",
+    "uvlock": true,
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "oak_spirit"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "oil_of_vitriol"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "otherworldly_tears"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "poultry_tincture"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "resonating_recursive_essence"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,16 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "textures": {
+      "texture": "contenttweaker:blocks/sacred_cinders_wood",
+      "particle": "contenttweaker:blocks/sacred_cinders_wood"
+    },
+    "model": "base:storage",
+    "uvlock": true,
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "salty_tincture"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,16 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "textures": {
+      "texture": "contenttweaker:blocks/sanguine_neural_network",
+      "particle": "contenttweaker:blocks/sanguine_neural_network"
+    },
+    "model": "base:storage",
+    "uvlock": true,
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "spruce_heart"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "stochastic_recursive_essence"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "stone_ichor"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,16 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "textures": {
+      "texture": "contenttweaker:blocks/stone_of_constraint",
+      "particle": "contenttweaker:blocks/stone_of_constraint"
+    },
+    "model": "base:storage",
+    "uvlock": true,
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "stone_tincture"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,16 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "textures": {
+      "texture": "contenttweaker:blocks/stormlight_collector",
+      "particle": "contenttweaker:blocks/stormlight_collector"
+    },
+    "model": "base:storage",
+    "uvlock": true,
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [{}],
+    "inventory": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "swirl_of_depths"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "tallow_tincture"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "tear_of_nature"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "vibrating_recursive_essence"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "whisper_of_worthiness"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "forge:fluid",
+    "custom": {
+      "fluid": "white_sage_tincture"
+    }
+  },
+  "variants": {
+    "normal": [{}]
+  }
+}