Merge branch 'master' of git@github.com:didi1150/InformatikProject.git

didi1150 · Jul 7, 2022 · f009dab · f009dab
2 parents 7440c56 + edd4920
commit f009dab
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 0 deletions.
diff --git a/InformatikProjekt/assets/minecraft/mcpatcher/cit/cosmic_drive.png b/InformatikProjekt/assets/minecraft/mcpatcher/cit/cosmic_drive.png
diff --git a/InformatikProjekt/assets/minecraft/mcpatcher/cit/cosmic_drive.properties b/InformatikProjekt/assets/minecraft/mcpatcher/cit/cosmic_drive.properties
@@ -0,0 +1,3 @@
+type=item
+items=minecraft:iron_helmet
+nbt.display.Name=ipattern:*Cosmic Drive*
diff --git a/InformatikProjekt/assets/minecraft/mcpatcher/cit/deaths_dance.png b/InformatikProjekt/assets/minecraft/mcpatcher/cit/deaths_dance.png
diff --git a/InformatikProjekt/assets/minecraft/mcpatcher/cit/deaths_dance.properties b/InformatikProjekt/assets/minecraft/mcpatcher/cit/deaths_dance.properties
@@ -0,0 +1,3 @@
+type=item
+items=minecraft:wooden_shovel
+nbt.display.Name=ipattern:*Death's Dance*
diff --git a/InformatikProjekt/assets/minecraft/mcpatcher/cit/essence_reaver.png b/InformatikProjekt/assets/minecraft/mcpatcher/cit/essence_reaver.png
diff --git a/InformatikProjekt/assets/minecraft/mcpatcher/cit/essence_reaver.properties b/InformatikProjekt/assets/minecraft/mcpatcher/cit/essence_reaver.properties
@@ -0,0 +1,3 @@
+type=item
+items=minecraft:diamond_horse_armor
+nbt.display.Name=ipattern:*Essence Reaver*
diff --git a/InformatikProjekt/assets/minecraft/mcpatcher/cit/lightsaber.png b/InformatikProjekt/assets/minecraft/mcpatcher/cit/lightsaber.png
diff --git a/InformatikProjekt/assets/minecraft/mcpatcher/cit/lightsaber.properties b/InformatikProjekt/assets/minecraft/mcpatcher/cit/lightsaber.properties
@@ -0,0 +1,4 @@
+type=item
+items=minecraft:stick
+texture=lightsaber.png
+nbt.display.Name=ipattern:*Youngling Slayer 9000*
diff --git a/InformatikProjekt/assets/minecraft/mcpatcher/cit/steraks_gage.png b/InformatikProjekt/assets/minecraft/mcpatcher/cit/steraks_gage.png
diff --git a/InformatikProjekt/assets/minecraft/mcpatcher/cit/steraks_gage.properties b/InformatikProjekt/assets/minecraft/mcpatcher/cit/steraks_gage.properties
@@ -0,0 +1,3 @@
+type=item
+items=minecraft:golden_horse_armor
+nbt.display.Name=ipattern:*Sterak's Gage*
diff --git a/InformatikProjekt/assets/minecraft/mcpatcher/cit/thornmail.png b/InformatikProjekt/assets/minecraft/mcpatcher/cit/thornmail.png
diff --git a/InformatikProjekt/assets/minecraft/mcpatcher/cit/thornmail.properties b/InformatikProjekt/assets/minecraft/mcpatcher/cit/thornmail.properties
@@ -0,0 +1,3 @@
+type=item
+items=minecraft:iron_chestplate
+nbt.display.Name=ipattern:*Thornmail*
diff --git a/InformatikProjekt/assets/minecraft/mcpatcher/cit/wits_end.png b/InformatikProjekt/assets/minecraft/mcpatcher/cit/wits_end.png
diff --git a/InformatikProjekt/assets/minecraft/mcpatcher/cit/wits_end.properties b/InformatikProjekt/assets/minecraft/mcpatcher/cit/wits_end.properties
@@ -0,0 +1,3 @@
+type=item
+items=minecraft:diamond_sword
+nbt.display.Name=ipattern:*Wit's End*
diff --git a/InformatikProjekt/assets/minecraft/models/items/navigator.png b/InformatikProjekt/assets/minecraft/models/items/navigator.png
diff --git a/InformatikProjekt/assets/minecraft/models/items/navigator.properties b/InformatikProjekt/assets/minecraft/models/items/navigator.properties
@@ -0,0 +1,3 @@
+type=item
+items=minecraft:iron_sword
+nbt.display.Name=ipattern:*Hyperion*