Upstream v3.6.0 (#16)

assets/minecraft/optifine/cit/architects_ring/charm/placeholders/charm_placeholder_1.properties

@@ -0,0 +1,5 @@
+type=item
+items=light_weighted_pressure_plate daylight_detector black_candle cocoa_beans glowstone_dust ender_eye redstone fire_coral purple_dye sugar warped_fungus_on_a_stick bowl red_dye chorus_plant chorus_flower wheat_seeds scute stick flint blaze_rod flower_banner_pattern nether_star dragon_breath gray_dye ice piston painting nether_brick nautilus_shell iron_ingot copper_ingot iron_bars red_glazed_terracotta heart_of_the_sea firework_star netherite_scrap magma_cream gunpowder glass_bottle blaze_powder black_carpet bell red_stained_glass quartz stone_sword gray_glazed_terracotta leather deepslate light_gray_glazed_terracotta book blue_dye skeleton_skull black_dye netherite_sword red_candle clock emerald candle orange_glazed_terracotta lime_stained_glass_pane red_carpet amethyst_shard light_blue_stained_glass phantom_membrane amethyst_cluster horn_coral purple_stained_glass purple_glazed_terracotta light_blue_glazed_terracotta magma_block sunflower snow_block iron_door chain feather cactus poppy stone_brick_wall fire_coral_fan nether_wart_block rabbit_foot lime_concrete black_glazed_terracotta brown_dye creeper_head purple_concrete_powder pointed_dripstone cyan_glazed_terracotta brewing_stand yellow_dye pumpkin_seeds pink_dye large_amethyst_bud yellow_stained_glass white_glazed_terracotta fire_charge soul_soil soul_lantern wither_rose jack_o_lantern soul_sand ghast_tear dead_tube_coral wither_skeleton_skull bone prismarine_shard zombie_head tnt white_dye target dead_brain_coral string yellow_glazed_terracotta gold_nugget
+model=optifine/cit/source_models/charm
+texture=charm_placeholder_1
+nbt.Monumenta.CharmPower=1

assets/minecraft/optifine/cit/architects_ring/charm/placeholders/charm_placeholder_2.properties

@@ -0,0 +1,5 @@
+type=item
+items=light_weighted_pressure_plate daylight_detector black_candle cocoa_beans glowstone_dust ender_eye redstone fire_coral purple_dye sugar warped_fungus_on_a_stick bowl red_dye chorus_plant chorus_flower wheat_seeds scute stick flint blaze_rod flower_banner_pattern nether_star dragon_breath gray_dye ice piston painting nether_brick nautilus_shell iron_ingot copper_ingot iron_bars red_glazed_terracotta heart_of_the_sea firework_star netherite_scrap magma_cream gunpowder glass_bottle blaze_powder black_carpet bell red_stained_glass quartz stone_sword gray_glazed_terracotta leather deepslate light_gray_glazed_terracotta book blue_dye skeleton_skull black_dye netherite_sword red_candle clock emerald candle orange_glazed_terracotta lime_stained_glass_pane red_carpet amethyst_shard light_blue_stained_glass phantom_membrane amethyst_cluster horn_coral purple_stained_glass purple_glazed_terracotta light_blue_glazed_terracotta magma_block sunflower snow_block iron_door chain feather cactus poppy stone_brick_wall fire_coral_fan nether_wart_block rabbit_foot lime_concrete black_glazed_terracotta brown_dye creeper_head purple_concrete_powder pointed_dripstone cyan_glazed_terracotta brewing_stand yellow_dye pumpkin_seeds pink_dye large_amethyst_bud yellow_stained_glass white_glazed_terracotta fire_charge soul_soil soul_lantern wither_rose jack_o_lantern soul_sand ghast_tear dead_tube_coral wither_skeleton_skull bone prismarine_shard zombie_head tnt white_dye target dead_brain_coral string yellow_glazed_terracotta gold_nugget
+model=optifine/cit/source_models/charm
+texture=charm_placeholder_2
+nbt.Monumenta.CharmPower=2

assets/minecraft/optifine/cit/architects_ring/charm/placeholders/charm_placeholder_3.properties

@@ -0,0 +1,5 @@
+type=item
+items=light_weighted_pressure_plate daylight_detector black_candle cocoa_beans glowstone_dust ender_eye redstone fire_coral purple_dye sugar warped_fungus_on_a_stick bowl red_dye chorus_plant chorus_flower wheat_seeds scute stick flint blaze_rod flower_banner_pattern nether_star dragon_breath gray_dye ice piston painting nether_brick nautilus_shell iron_ingot copper_ingot iron_bars red_glazed_terracotta heart_of_the_sea firework_star netherite_scrap magma_cream gunpowder glass_bottle blaze_powder black_carpet bell red_stained_glass quartz stone_sword gray_glazed_terracotta leather deepslate light_gray_glazed_terracotta book blue_dye skeleton_skull black_dye netherite_sword red_candle clock emerald candle orange_glazed_terracotta lime_stained_glass_pane red_carpet amethyst_shard light_blue_stained_glass phantom_membrane amethyst_cluster horn_coral purple_stained_glass purple_glazed_terracotta light_blue_glazed_terracotta magma_block sunflower snow_block iron_door chain feather cactus poppy stone_brick_wall fire_coral_fan nether_wart_block rabbit_foot lime_concrete black_glazed_terracotta brown_dye creeper_head purple_concrete_powder pointed_dripstone cyan_glazed_terracotta brewing_stand yellow_dye pumpkin_seeds pink_dye large_amethyst_bud yellow_stained_glass white_glazed_terracotta fire_charge soul_soil soul_lantern wither_rose jack_o_lantern soul_sand ghast_tear dead_tube_coral wither_skeleton_skull bone prismarine_shard zombie_head tnt white_dye target dead_brain_coral string yellow_glazed_terracotta gold_nugget
+model=optifine/cit/source_models/charm
+texture=charm_placeholder_3
+nbt.Monumenta.CharmPower=3

assets/minecraft/optifine/cit/architects_ring/charm/placeholders/charm_placeholder_4.properties

@@ -0,0 +1,5 @@
+type=item
+items=light_weighted_pressure_plate daylight_detector black_candle cocoa_beans glowstone_dust ender_eye redstone fire_coral purple_dye sugar warped_fungus_on_a_stick bowl red_dye chorus_plant chorus_flower wheat_seeds scute stick flint blaze_rod flower_banner_pattern nether_star dragon_breath gray_dye ice piston painting nether_brick nautilus_shell iron_ingot copper_ingot iron_bars red_glazed_terracotta heart_of_the_sea firework_star netherite_scrap magma_cream gunpowder glass_bottle blaze_powder black_carpet bell red_stained_glass quartz stone_sword gray_glazed_terracotta leather deepslate light_gray_glazed_terracotta book blue_dye skeleton_skull black_dye netherite_sword red_candle clock emerald candle orange_glazed_terracotta lime_stained_glass_pane red_carpet amethyst_shard light_blue_stained_glass phantom_membrane amethyst_cluster horn_coral purple_stained_glass purple_glazed_terracotta light_blue_glazed_terracotta magma_block sunflower snow_block iron_door chain feather cactus poppy stone_brick_wall fire_coral_fan nether_wart_block rabbit_foot lime_concrete black_glazed_terracotta brown_dye creeper_head purple_concrete_powder pointed_dripstone cyan_glazed_terracotta brewing_stand yellow_dye pumpkin_seeds pink_dye large_amethyst_bud yellow_stained_glass white_glazed_terracotta fire_charge soul_soil soul_lantern wither_rose jack_o_lantern soul_sand ghast_tear dead_tube_coral wither_skeleton_skull bone prismarine_shard zombie_head tnt white_dye target dead_brain_coral string yellow_glazed_terracotta gold_nugget
+model=optifine/cit/source_models/charm
+texture=charm_placeholder_4
+nbt.Monumenta.CharmPower=4

assets/minecraft/optifine/cit/architects_ring/charm/placeholders/charm_placeholder_5.properties

@@ -0,0 +1,5 @@
+type=item
+items=light_weighted_pressure_plate daylight_detector black_candle cocoa_beans glowstone_dust ender_eye redstone fire_coral purple_dye sugar warped_fungus_on_a_stick bowl red_dye chorus_plant chorus_flower wheat_seeds scute stick flint blaze_rod flower_banner_pattern nether_star dragon_breath gray_dye ice piston painting nether_brick nautilus_shell iron_ingot copper_ingot iron_bars red_glazed_terracotta heart_of_the_sea firework_star netherite_scrap magma_cream gunpowder glass_bottle blaze_powder black_carpet bell red_stained_glass quartz stone_sword gray_glazed_terracotta leather deepslate light_gray_glazed_terracotta book blue_dye skeleton_skull black_dye netherite_sword red_candle clock emerald candle orange_glazed_terracotta lime_stained_glass_pane red_carpet amethyst_shard light_blue_stained_glass phantom_membrane amethyst_cluster horn_coral purple_stained_glass purple_glazed_terracotta light_blue_glazed_terracotta magma_block sunflower snow_block iron_door chain feather cactus poppy stone_brick_wall fire_coral_fan nether_wart_block rabbit_foot lime_concrete black_glazed_terracotta brown_dye creeper_head purple_concrete_powder pointed_dripstone cyan_glazed_terracotta brewing_stand yellow_dye pumpkin_seeds pink_dye large_amethyst_bud yellow_stained_glass white_glazed_terracotta fire_charge soul_soil soul_lantern wither_rose jack_o_lantern soul_sand ghast_tear dead_tube_coral wither_skeleton_skull bone prismarine_shard zombie_head tnt white_dye target dead_brain_coral string yellow_glazed_terracotta gold_nugget
+model=optifine/cit/source_models/charm
+texture=charm_placeholder_5
+nbt.Monumenta.CharmPower=5

assets/minecraft/optifine/cit/architects_ring/key/content_key/silver_knights_key/silver_knights_key.properties

@@ -0,0 +1,5 @@
+type=item
+items=deepslate
+model=optifine/cit/source_models/key
+texture=silver_knights_key
+nbt.plain.display.Name=Silver Knight's Key

assets/minecraft/optifine/cit/architects_ring/key/content_key/silver_knights_key_story_mode/silver_knights_key_story_mode.properties

@@ -0,0 +1,5 @@
+type=item
+items=deepslate
+model=optifine/cit/source_models/key
+texture=silver_knights_key_story_mode
+nbt.plain.display.Name=Silver Knight's Key - Story Mode

assets/minecraft/optifine/cit/architects_ring/masterwork/skt/word_of_the_architect/word_of_the_architect.properties

@@ -0,0 +1,10 @@
+type=item
+matchItems=bow
+model=optifine/cit/source_models/large_bow
+texture=word_of_the_architect_standby
+texture.bow_pulling_0=word_of_the_architect_standby
+texture.bow_pulling_1=word_of_the_architect_pulling_1
+texture.bow_pulling_2=word_of_the_architect_pulling_2
+texture.bow_pulling_3=word_of_the_architect_pulling_3
+texture.bow_pulling_4=word_of_the_architect_pulling_4
+nbt.plain.display.Name=Word of the Architect

assets/minecraft/optifine/cit/architects_ring/masterwork/skt/word_of_the_architect/word_of_the_architect_pulling_4.png.mcmeta

@@ -0,0 +1,19 @@
+{
+    "animation": { 
+        "frames": [
+            {
+                "index": 0,
+                "time": 1            
+			}, {
+                "index": 1,
+                "time": 1
+            }, {
+                "index": 2,
+                "time": 1
+            }, {
+                "index": 3,
+                "time": 1000            
+			}
+        ]
+    }
+}

assets/minecraft/optifine/cit/architects_ring/misc/blue/the_vedhas_broomstick/the_vedhas_broomstick.properties

@@ -0,0 +1,3 @@
+matchItems=trident
+nbt.plain.display.Name=The Vedha's Broomstick
+texture=the_vedhas_broomstick

assets/minecraft/optifine/cit/celsian_isles/artifact/battle_pass/steel_apparatus/steel_apparatus_armor.properties

@@ -0,0 +1,4 @@
+type=armor
+matchItems=turtle_helmet
+texture.turtle_layer_1=steel_apparatus_armor
+nbt.plain.display.Name=Steel Apparatus

assets/minecraft/optifine/cit/celsian_isles/artifact/battle_pass/steel_apparatus/steel_apparatus_icon.properties

@@ -0,0 +1,4 @@
+type=item
+matchItems=turtle_helmet
+texture=steel_apparatus_icon
+nbt.plain.display.Name=Steel Apparatus

assets/minecraft/optifine/cit/celsian_isles/artifact/the_headless_horseman/blackthread_whip/blackthread_whip.properties

@@ -0,0 +1,5 @@
+type=item
+matchItems=stone_sword
+model=optifine/cit/source_models/large
+texture=blackthread_whip
+nbt.plain.display.Name=Blackthread Whip

assets/minecraft/optifine/cit/celsian_isles/artifact/upgraded_tesseracts/purple/purple_tesseract_effects_u.png.mcmeta

@@ -0,0 +1,31 @@
+{
+    "animation": { 
+        "frames": [
+            {
+                "index": 0,
+                "time": 30            
+            }, {
+                "index": 1,
+                "time": 2
+            }, {
+                "index": 2,
+                "time": 2
+            }, {
+                "index": 3,
+                "time": 2            
+            }, {
+                "index": 4,
+                "time": 2
+            }, {
+                "index": 5,
+                "time": 2
+            }, {
+                "index": 6,
+                "time": 2            
+            }, {
+                "index": 7,
+                "time": 2
+            }
+        ]
+    }
+}

assets/minecraft/optifine/cit/celsian_isles/artifact/upgraded_tesseracts/purple/purple_tesseract_inside_u.png.mcmeta

@@ -0,0 +1,14 @@
+{
+	"animation": {
+		"interpolate": false,
+		"frametime": 2,
+		"frames": [
+			0,
+			1,
+			2,
+			3,
+			4,
+			5
+		]
+	}
+}

assets/minecraft/optifine/cit/celsian_isles/artifact/upgraded_tesseracts/purple/purple_tesseract_u.properties

@@ -0,0 +1,5 @@
+type=item
+items=purple_stained_glass
+model=optifine/cit/source_models/tesseracts/upgraded/purple_tesseract_u
+texture=purple_tesseract_u
+nbt.plain.display.Name=Tesseract of Emotions (u)

assets/minecraft/optifine/cit/celsian_isles/artifact/upgraded_tesseracts/yellow/yellow_tesseract_effects_u.png.mcmeta

@@ -0,0 +1,31 @@
+{
+    "animation": { 
+        "frames": [
+            {
+                "index": 0,
+                "time": 30            
+            }, {
+                "index": 1,
+                "time": 2
+            }, {
+                "index": 2,
+                "time": 2
+            }, {
+                "index": 3,
+                "time": 2            
+            }, {
+                "index": 4,
+                "time": 2
+            }, {
+                "index": 5,
+                "time": 2
+            }, {
+                "index": 6,
+                "time": 2            
+            }, {
+                "index": 7,
+                "time": 2
+            }
+        ]
+    }
+}

assets/minecraft/optifine/cit/celsian_isles/artifact/upgraded_tesseracts/yellow/yellow_tesseract_inside_u.png.mcmeta

@@ -0,0 +1,6 @@
+{
+  "animation": {
+    "interpolate": true,
+    "frametime": 2
+  }
+}

assets/minecraft/optifine/cit/celsian_isles/artifact/upgraded_tesseracts/yellow/yellow_tesseract_u.properties

@@ -0,0 +1,5 @@
+type=item
+items=yellow_stained_glass
+model=optifine/cit/source_models/tesseracts/upgraded/yellow_tesseract_u
+texture=yellow_tesseract_u
+nbt.plain.display.Name=Tesseract of the Elements (u)

assets/minecraft/optifine/cit/celsian_isles/currency/ancestral_effigy/ancestral_effigy.png.mcmeta

@@ -3,7 +3,7 @@
         "frames": [
             {
                 "index": 0,
-                "time": 150            
+                "time": 1            
 			}, {
                 "index": 1,
                 "time": 1
@@ -28,36 +28,6 @@
             }, {
                 "index": 8,
                 "time": 1
-            }, {
-                "index": 9,
-                "time": 1
-            }, {
-                "index": 10,
-                "time": 1
-            }, {
-                "index": 11,
-                "time": 1
-            }, {
-                "index": 12,
-                "time": 1
-            }, {
-                "index": 13,
-                "time": 1
-            }, {
-                "index": 14,
-                "time": 1
-            }, {
-                "index": 15,
-                "time": 1
-            }, {
-                "index": 16,
-                "time": 1
-            }, {
-                "index": 17,
-                "time": 1
-            }, {
-                "index": 18,
-                "time": 1
             }
         ]
     }

assets/minecraft/optifine/cit/celsian_isles/currency/pulsating_emerald/pulsating_emerald.png.mcmeta

@@ -1,6 +1,6 @@
 {
   "animation": {
-    "frametime": 5,
+    "frametime": 10,
     "interpolate": true,
     "frames": [
       0,

assets/minecraft/optifine/cit/celsian_isles/patron/items/gilded_gauntlet/gilded_gauntlet.properties

@@ -0,0 +1,5 @@
+type=item
+matchItems=gold_ingot
+model=optifine/cit/source_models/items/gilded_gauntlet
+texture=gilded_gauntlet
+nbt.plain.display.Name=Gilded Gauntlet

assets/minecraft/optifine/cit/celsian_isles/rare/casino/amaranth_blade/amaranth_blade.properties

@@ -0,0 +1,5 @@
+type=item
+matchItems=iron_sword
+model=optifine/cit/source_models/large
+texture=amaranth_blade
+nbt.plain.display.Name=Amaranth Blade

assets/minecraft/optifine/cit/celsian_isles/rare/casino/gamblers_cane/gamblers_cane.properties

@@ -0,0 +1,5 @@
+type=item
+matchItems=iron_hoe
+model=optifine/cit/source_models/large
+texture=gamblers_cane
+nbt.plain.display.Name=Gambler's Cane

assets/minecraft/optifine/cit/celsian_isles/rare/casino/true_ice_splinter/true_ice_splinter.properties

@@ -0,0 +1,5 @@
+type=item
+matchItems=iron_sword
+model=optifine/cit/source_models/large
+texture=true_ice_splinter
+nbt.plain.display.Name=True Ice Splinter

assets/minecraft/optifine/cit/celsian_isles/rare/cyan/malebolge_stave/malebolge_stave.properties

@@ -0,0 +1,5 @@
+type=item
+matchItems=stick
+model=optifine/cit/source_models/large
+texture=malebolge_stave
+nbt.plain.display.Name=Malebolge Stave

assets/minecraft/optifine/cit/celsian_isles/rare/purple/sunken_blunderbuss/sunken_blunderbuss.txt

@@ -0,0 +1,10 @@
+type=item
+matchItems=crossbow
+model=optifine/cit/source_models/crossbow_gun
+texture=sunken_blunderbuss_standby
+texture.crossbow_pulling_0=sunken_blunderbuss_pulling_0
+texture.crossbow_pulling_1=sunken_blunderbuss_pulling_1
+texture.crossbow_pulling_2=sunken_blunderbuss_pulling_2
+texture.crossbow_arrow=sunken_blunderbuss_arrow
+texture.crossbow_firework=sunken_blunderbuss_firework
+nbt.plain.display.Name=Sunken Blunderbuss

assets/minecraft/optifine/cit/celsian_isles/skin/eternity/serenity_of_the_stars/serenity_of_the_stars.png.mcmeta

@@ -3,7 +3,7 @@
         "frames": [
             {
                 "index": 0,
-                "time": 100            
+                "time": 40            
 			}, {
                 "index": 1,
                 "time": 1
@@ -45,7 +45,7 @@
                 "time": 1
             }, {
                 "index": 14,
-                "time": 100
+                "time": 1
             }, {
                 "index": 15,
                 "time": 1
@@ -67,6 +67,45 @@
             }, {
                 "index": 21,
                 "time": 1
+            }, {
+                "index": 22,
+                "time": 1
+            }, {
+                "index": 23,
+                "time": 1
+            }, {
+                "index": 24,
+                "time": 1
+            }, {
+                "index": 25,
+                "time": 1
+            }, {
+                "index": 26,
+                "time": 1
+            }, {
+                "index": 27,
+                "time": 1
+            }, {
+                "index": 28,
+                "time": 1
+            }, {
+                "index": 29,
+                "time": 1
+            }, {
+                "index": 30,
+                "time": 20
+            }, {
+                "index": 31,
+                "time": 1
+            }, {
+                "index": 32,
+                "time": 1
+            }, {
+                "index": 33,
+                "time": 1
+            }, {
+                "index": 34,
+                "time": 1
             }
         ]
     }

assets/minecraft/optifine/cit/celsian_isles/skin/patron/amecyans_frost_giants_crusher/amecyans_frost_giants_crusher.properties

@@ -0,0 +1,7 @@
+type=item
+matchItems=iron_axe
+model=optifine/cit/source_models/large
+texture=amecyans_frost_giants_crusher
+nbt.plain.display.Name=Frost Giant's Crusher
+nbt.Monumenta.PlayerModified.Infusions.Hope.Infuser=dde80286-34dc-4f9e-b385-ef919ce08733
+weight=2

assets/minecraft/optifine/cit/celsian_isles/skin/patron/kio_nihilo_pome/kio_nihilo_pome.properties

@@ -0,0 +1,6 @@
+type=item
+items=minecraft:chorus_fruit
+model=optifine/cit/source_models/items/food/kio_nihilo_pome
+nbt.Monumenta.PlayerModified.Infusions.Hope.Infuser=52b101ec-c945-433f-bd1a-0c20d631166c
+nbt.plain.display.Name=Nihilo Pome
+weight=2