Merge branch '1.15' into 'master'

Update 1.15 See merge request dodsorfas/minecraft-datapacks!10
2020-02-24 00:28:39 +00:00 · 2020-02-24 00:28:39 +00:00 · 0a90343dd0
parent 5cc48aa822 5374edaaf9
commit 0a90343dd0
12 changed files with 23 additions and 6 deletions
--- a/resourcepack/Selected
+++ b/resourcepack/Selected
@ -0,0 +1,17 @@
+Vanilla Tweaks Resource Pack
+Version: 1.15
+Packs:
+	DifferentStems
+	RedIronGolemFlowers
+	PlainLeatherArmor
+	Age25Kelp
+	StickyPistonSides
+	DirectionalHoppers
+	BetterObservers
+	UnobtrusiveRain
+	LowerShield
+	TransparentPumpkin
+	RainbowExperience
+	PingColorIndicator
+	NoJavaEditionTitle
+	HoneycombBackground
--- a/resourcepack/assets/minecraft/textures/block/hopper_outside_flipped.png
+++ b/resourcepack/assets/minecraft/textures/block/hopper_outside_flipped.png
--- a/resourcepack/assets/minecraft/textures/entity/iron_golem.png
+++ b/resourcepack/assets/minecraft/textures/entity/iron_golem.png
--- a/resourcepack/assets/minecraft/textures/entity/iron_golem/iron_golem.png
+++ b/resourcepack/assets/minecraft/textures/entity/iron_golem/iron_golem.png
--- a/resourcepack/assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_high.png
+++ b/resourcepack/assets/minecraft/textures/entity/iron_golem/iron_golem_crackiness_high.png
--- a/resourcepack/assets/minecraft/textures/gui/icons.png
+++ b/resourcepack/assets/minecraft/textures/gui/icons.png
--- a/resourcepack/assets/minecraft/textures/gui/options_background.png
+++ b/resourcepack/assets/minecraft/textures/gui/options_background.png
--- a/resourcepack/assets/minecraft/textures/gui/title/edition.png
+++ b/resourcepack/assets/minecraft/textures/gui/title/edition.png
--- a/resourcepack/assets/minecraft/textures/gui/title/minecraft.png
+++ b/resourcepack/assets/minecraft/textures/gui/title/minecraft.png
--- a/resourcepack/assets/minecraft/textures/item/iron_nugget.png
+++ b/resourcepack/assets/minecraft/textures/item/iron_nugget.png
--- a/resourcepack/pack.mcmeta
+++ b/resourcepack/pack.mcmeta
@ -1,6 +1,6 @@
-{
-    "pack": {
-        "pack_format": 4,
-        "description": "Dodsorfas Resourcepack"
-    }
-}
+{
+    "pack": {
+        "pack_format": 5,
+        "description": "Dodsorfas Resourcepack (Vanilla Tweaks)"
+    }
+}
--- a/resourcepack/pack.png
+++ b/resourcepack/pack.png