openclonk/planet/Objects.ocd/Environment.ocd/Disasters.ocd/BoilingLava.ocd
Sven Eberhardt bce903ee04 Merge branch 'master' into qteditor
Conflicts:
	planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Animal.ocd/CreatureControl.ocd/DefCore.txt
2016-08-13 23:42:59 -04:00
..
Bubble.ocd Add HideInCreator=true to internal/helper/library definitions 2016-07-10 22:06:48 -04:00
Spawner.ocd Add HideInCreator=true to internal/helper/library definitions 2016-07-10 22:06:48 -04:00
DefCore.txt added BoilingLava and BoilingAcid environmental rules 2015-09-11 19:08:10 +02:00
Script.c Fix insect swarm and boiling lava scenario saving. 2015-09-17 21:59:05 -04:00
StringTblDE.txt added BoilingLava and BoilingAcid environmental rules 2015-09-11 19:08:10 +02:00
StringTblUS.txt fix boiling lava name 2016-08-08 23:04:21 +02:00