sync + merge (conflict) + Tweak: cd 2->0.5, max level 11->10, maxMovement 5->15 #148

Closed exentro closed 6 years ago