summaryrefslogtreecommitdiff
path: root/world/map/db/mob_db.conf
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/db/mob_db.conf')
-rw-r--r--world/map/db/mob_db.conf9
1 files changed, 0 insertions, 9 deletions
diff --git a/world/map/db/mob_db.conf b/world/map/db/mob_db.conf
index b0c2a55c..6dadeb30 100644
--- a/world/map/db/mob_db.conf
+++ b/world/map/db/mob_db.conf
@@ -10267,21 +10267,12 @@ mob_db: (
MutationCount: 0
MutationStrength: 0
Drops: {
-<<<<<<< HEAD
Charcoal: 1000
Charcoal: 500
Charcoal: 250
Coal: 5000
Coal: 2500
Coal: 1250
-=======
- Naftalin: 400
- Naftalin: 300
- Naftalin: 200
- Coal: 10000
- Coal: 5000
- Coal: 2500
->>>>>>> 2bcac1ed (Coal Golem)
IronOre: 500
IronPowder: 1200
}