marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
openclonk/planet/Objects.ocd/Libraries.ocd/Producer.ocd
History
David Dormagen 36544bd56c Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
	planet/Objects.ocd/Structures.ocd/Foundry.ocd/Script.c
	planet/Objects.ocd/Vegetation.ocd/Branch.ocd/Script.c
	planet/Objects.ocd/Vegetation.ocd/Trunk.ocd/Script.c
	planet/System.ocg/FindLocation.c
 		2015-08-02 19:24:04 +02:00
..
Icons.ocd increase game content version entries to 6.0 2014-12-12 22:58:16 +01:00
DefCore.txt increase game content version entries to 6.0 2014-12-12 22:58:16 +01:00
Script.c Merge branch 'master' into Controls 2015-08-02 19:24:04 +02:00
StringTblDE.txt interaction menu: improved support/updating of custom entries; adapted pump & producer to interaction menu 2015-03-01 10:27:29 +01:00
StringTblUS.txt interaction menu: improved support/updating of custom entries; adapted pump & producer to interaction menu 2015-03-01 10:27:29 +01:00