From d97fdc1ac24ae9b127427bbee116d97327a06f57 Mon Sep 17 00:00:00 2001
From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com>
Date: Sun, 21 Jul 2019 22:50:51 +0200
Subject: [PATCH] added lanterns and potions

---
 common/src/comp/body/object.rs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/common/src/comp/body/object.rs b/common/src/comp/body/object.rs
index 4c4d989790..18d41440e1 100644
--- a/common/src/comp/body/object.rs
+++ b/common/src/comp/body/object.rs
@@ -35,6 +35,7 @@ impl Body {
     }
 }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 const ALL_OBJECTS: [Body; 24] = [
@@ -68,10 +69,20 @@ const ALL_OBJECTS: [Body; 5] = [Body::Bomb, Body::Scarecrow, Body::Chest, Body::
 >>>>>>> Add campfire
 =======
 const ALL_OBJECTS: [Body; 5] = [
+=======
+const ALL_OBJECTS: [Body; 12] = [
+>>>>>>> added lanterns and potions
     Body::Bomb,
     Body::Scarecrow,
     Body::Chest,
     Body::Pumpkin,
     Body::Campfire,
+    Body::LanternGround,
+    Body::LanternGroundOpen,
+    Body::LanternStanding,
+    Body::LanternStanding2,
+    Body::PotionRed,
+    Body::PotionBlue,
+    Body::PotionGreen,
 ];
 >>>>>>> formatting