.
Merge branch 'master' of https://github.com/LuciusYu/TownSimulator.git
中文化
增加建筑公司
设定更换为能量
Merge branch 'master' of https://github.com/LuciusYu/TownSimulator.git

Conflicts:
	TownSimulator/src/com/TownSimulator/driver/Driver.java
	TownSimulator/src/com/TownSimulator/utility/particle/ParticleControl.java