I have fixed all the broken files

SurajDatta · Dec 22, 2017 · bad8d84 · bad8d84
1 parent 7431636
commit bad8d84
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 25 deletions.
diff --git a/engine/src/main/java/org/destinationsol/ModuleManager.java b/engine/src/main/java/org/destinationsol/ModuleManager.java
@@ -94,6 +94,7 @@ public ModuleManager() {
         requiredModules.add(registry.getLatestModuleVersion(new Name("core")));
         requiredModules.add(registry.getLatestModuleVersion(new Name("federal")));
         requiredModules.add(registry.getLatestModuleVersion(new Name("organic")));
+        requiredModules.add(registry.getLatestModuleVersion(new Name("tribe")));
 
         loadEnvironment(requiredModules);
     }

diff --git a/modules/tribe/ReadMe.txt b/modules/tribe/ReadMe.txt
@@ -1,4 +1,4 @@
-CREDITS
+qCREDITS
 
 - credits for making all the ships goes to MillionthVector (http://millionthvector.blogspot.ae/)
 

diff --git a/modules/tribe/assets/configs/startingStation.json b/modules/tribe/assets/configs/startingStation.json
@@ -1,10 +1,6 @@
 {
   "hull": "tribe:serenityCapital",
   "items": "tribe:laser tribe:laser",
-<<<<<<< HEAD
-=======
-
->>>>>>> 276498a603485636ca2723b45efe9ca48090b347
   "guard": {
     "hull": "tribe:capital",
     "items": "tribe:laser core:fixedShotGun core:mediumArmor+core:heavyArmor core:shield+core:bigShield",

diff --git a/modules/tribe/assets/items/clips/laserClip/laserClip.json b/modules/tribe/assets/items/clips/laserClip/laserClip.json
@@ -2,9 +2,6 @@
   "projectile": "laser",
   "infinite": true,
   "size": 100
-<<<<<<< HEAD
   "displayName": "laser"
   "iconName": "laserIcon"
-=======
->>>>>>> 276498a603485636ca2723b45efe9ca48090b347
 }
diff --git a/modules/tribe/assets/items/guns/laser/laser.json b/modules/tribe/assets/items/guns/laser/laser.json
@@ -8,11 +8,7 @@
   "price": 1000000,
   "clipName": "tribe:laserClip",
   "gunLength": 0.15,
-<<<<<<< HEAD
   "displayName": "laser",
-=======
-  "displayName": "Laser",
->>>>>>> 276498a603485636ca2723b45efe9ca48090b347
   "lightOnShot": true,
   "shootSounds": [
     "core:waveGun"

diff --git a/modules/tribe/assets/items/types.json b/modules/tribe/assets/items/types.json