diff --git a/.gitignore b/.gitignore
index c5710ee..1e53b75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,10 @@ run/crash-reports
 run/xaero
 run/screenshots
 run/Xaero*
+<<<<<<< HEAD
+run/serves*
+=======
+>>>>>>> refs/remotes/origin/main
 run/command_history.txt
 
 # java
diff --git a/run/servers.dat b/run/servers.dat
new file mode 100644
index 0000000..c9a90aa
Binary files /dev/null and b/run/servers.dat differ
diff --git a/run/servers.dat_old b/run/servers.dat_old
new file mode 100644
index 0000000..c9a90aa
Binary files /dev/null and b/run/servers.dat_old differ
diff --git a/src/main/java/de/jottyfan/minecraft/item/ModItems.java b/src/main/java/de/jottyfan/minecraft/item/ModItems.java
index 1d1bae0..3d93688 100644
--- a/src/main/java/de/jottyfan/minecraft/item/ModItems.java
+++ b/src/main/java/de/jottyfan/minecraft/item/ModItems.java
@@ -14,6 +14,7 @@ import net.minecraft.world.item.Item.Properties;
 public class ModItems extends ModItemsRegistrator {
 	public static final Item RAW_TIN = registerItem("raw_tin");
 	public static final Item RUBY = registerItem("ruby");
+	public static final Item FUTURISTIC_CROSSBOW = registerItem("futuristic_crossbow");
 	public static final Item CHILI = registerItem("chili");
 	public static final Item STUB = registerItem("stub", StubItem::new);
 	public static final Item TIN_INGOT = registerItem("tin_ingot");
@@ -24,6 +25,7 @@ public class ModItems extends ModItemsRegistrator {
 		List<Item> registeredItems = new ArrayList<>();
 		registeredItems.add(STUB);
 		registeredItems.add(RUBY);
+		registeredItems.add(FUTURISTIC_CROSSBOW);
 		registeredItems.add(CHILI);
 		registeredItems.add(RAW_TIN);
 		registeredItems.add(TIN_INGOT);
diff --git a/src/main/resources/assets/mfmd2627/items/futuristic_crossbow.json b/src/main/resources/assets/mfmd2627/items/futuristic_crossbow.json
new file mode 100644
index 0000000..f802acd
--- /dev/null
+++ b/src/main/resources/assets/mfmd2627/items/futuristic_crossbow.json
@@ -0,0 +1,6 @@
+{
+	"model":{
+	  "type": "minecraft:model",
+	  "model": "minecraft:item/futuristic_crossbow"
+	}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/mfmd2627/lang/de_de.json b/src/main/resources/assets/mfmd2627/lang/de_de.json
index 70b346a..4e8dcf8 100644
--- a/src/main/resources/assets/mfmd2627/lang/de_de.json
+++ b/src/main/resources/assets/mfmd2627/lang/de_de.json
@@ -3,6 +3,7 @@
   "item.mfmd2627.stub": "Stummel",
   "item.mfmd2627.raw_tin": "Zinn",
   "item.mfmd2627.ruby": "Rubin",
+  "item.mfmd2627.futuristic_crossbow": "futuristische Armbrust",
   "item.mfmd2627.tin_dust": "Zinnpulver",
   "item.mfmd2627.tin_ingot": "Zinnbarren",
   "item.mfmd2627.tin_ore": "Zinnerz",
diff --git a/src/main/resources/assets/mfmd2627/lang/en_us.json b/src/main/resources/assets/mfmd2627/lang/en_us.json
index 4185d66..e698c8a 100644
--- a/src/main/resources/assets/mfmd2627/lang/en_us.json
+++ b/src/main/resources/assets/mfmd2627/lang/en_us.json
@@ -3,6 +3,7 @@
   "item.mfmd2627.stub": "Stub",
   "item.mfmd2627.raw_tin": "Tin",
   "item.mfmd2627.ruby": "Ruby",
+  "item.mfmd2627.futuristic_crossbow": "Futuristic Crossbow",
   "item.mfmd2627.tin_dust": "Tin Dust",
   "item.mfmd2627.tin_ingot": "Tin Ingot",
   "item.mfmd2627.tin_ore": "Tin Ore",
diff --git a/src/main/resources/assets/mfmd2627/models/item/futuristic_crossbow.json b/src/main/resources/assets/mfmd2627/models/item/futuristic_crossbow.json
new file mode 100644
index 0000000..78ba67b
--- /dev/null
+++ b/src/main/resources/assets/mfmd2627/models/item/futuristic_crossbow.json
@@ -0,0 +1,7 @@
+{
+	"parent": "minecraft:item/generated",
+	"textures": {
+		"layer0": "mfmd2627:item/futuristic_crossbow"
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/mfmd2627/textures/item/futuristic_crossbow.png b/src/main/resources/assets/mfmd2627/textures/item/futuristic_crossbow.png
new file mode 100644
index 0000000..8f0b755
Binary files /dev/null and b/src/main/resources/assets/mfmd2627/textures/item/futuristic_crossbow.png differ