Clonkonaut
|
fdf6130cbe
|
Fixed my really bad merge...
|
2014-05-09 21:28:33 +02:00 |
Clonkonaut
|
d291623f24
|
Merge remote-tracking branch 'remotes/origin/master' into heavy-resources
Conflicts:
planet/Arena.ocf/Hideout.ocs/Material.ocg/Amethyst.ocm
planet/Arena.ocf/Hideout.ocs/Material.ocg/Ruby.ocm
planet/Missions.ocf/AcidDrilling.ocs/Scenario.txt
planet/Missions.ocf/DeadlyGrotto.ocs/Scenario.txt
planet/Missions.ocf/GoldenMountain.ocs/Scenario.txt
planet/Missions.ocf/MineRescue.ocs/Scenario.txt
planet/Missions.ocf/Skylands.ocs/Scenario.txt
planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
planet/Worlds.ocf/AcidGoldMine.ocs/Scenario.txt
planet/Worlds.ocf/GoldRush.ocs/Scenario.txt
planet/Worlds.ocf/IronPeak.ocs/Scenario.txt
planet/Worlds.ocf/Krakatoa.ocs/Scenario.txt
planet/Worlds.ocf/RubyCave.ocs/Scenario.txt
|
2014-05-09 19:45:52 +02:00 |
Maikel de Vries
|
1c6f62466b
|
Fixed Ametyst to Amethyst typos
|
2014-04-02 19:46:52 +02:00 |
Clonkonaut
|
ba521405ee
|
Added more chunks: Amethyst, Ice, Ruby, Snow
|
2014-03-30 22:18:25 +02:00 |
Sven Eberhardt
|
749ddb09aa
|
Updated local scenario material densities
|
2013-03-30 13:59:04 +01:00 |
Maikel de Vries
|
7523bf3ab5
|
Refactor scenarios: Arenas
|
2012-10-09 20:42:32 +02:00 |