Fixed a forgotten merge artifact in models.json

res/SimpleSkeleton.txt

@@ -1,11 +0,0 @@
-# 0.0000 0.0000 0.0000 0.0000 0.0000 4 0 Root
-## 0.0000 0.0000 0.0000 1.5708 30.0000 0 0 Head
-## 0.0000 0.0000 0.0000 -1.5708 50.0000 2 0 Back
-### 0.0000 0.0000 0.0000 -0.7854 50.0000 1 0 LLeg
-#### 0.0000 0.0000 0.0000 0.7854 50.0000 0 0 LLeg2
-### 0.0000 0.0000 0.0000 0.7854 50.0000 1 0 RLeg
-#### 0.0000 0.0000 0.0000 -0.7854 50.0000 0 0 RLeg2
-## 0.0000 0.0000 0.0000 -0.1000 40.0000 1 0 LArm
-### 0.0000 0.0000 0.0000 0.1000 40.0000 0 0 LArm2
-## 0.0000 0.0000 0.0000 3.2416 40.0000 1 0 RArm
-### 0.0000 0.0000 0.0000 -0.1000 40.0000 0 0 RArm2

res/models.json

@@ -8,20 +8,11 @@
 	{
 		name: "barrel",
 		id: 1,
-<<<<<<< HEAD
 		reflectivity: 0.5d
 	},
 	{
 		name: "lantern",
 		id: 2,
 		reflectivity: 0.5d
-=======
-		reflectivity: 0.5
-	},
-	{
-		name: "lantern",
-		id: 2,
-		reflectivity: 0.5
->>>>>>> branch 'master' of git@tankernn.eu:game3d.git
 	}
 ]

src/main/java/eu/tankernn/game/Game.java

@@ -54,7 +54,7 @@ public class Game extends TankernnGame3D {
 		TerrainTexturePack texturePack = new TerrainTexturePack(backgroundTexture, rTexture, gTexture, bTexture);
 		Texture blendMap = loader.loadTexture("blendMap.png");
 
-		terrainPack = new TerrainPack(loader, texturePack, blendMap, 1337);
+		terrainPack = new TerrainPack(loader, texturePack, blendMap, 1235);
 	}
 
 	private void setupWater() {