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
f2c1b3a66f
Added Terraflint, acquired from Firestone material.
...
Also added SplitTerraflint dummy definition to produce in the Alchemy Lab. Will provide you with 3 small flints.
Added the SplitTerraflint definition in scenario where it seemed fitting.
2014-04-27 15:42:33 +02:00
fa6795370f
Decoration.ocd added and includes ruins from DarkCastle
...
Please start using this folder for decorative objects other developers might want to use as well.
2014-04-06 15:50:06 +02:00
7f9f40a1f5
Renamed Settlement.ocf to Missions.ocf
2013-10-05 17:39:14 +02:00
Clonkonaut