PsiOmegaDelta 3fd28dd361 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	html/changelogs/.all_changelog.yml

2015-10-14 08:41:38 +02:00

..

material_recipes.dm

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

material_sheets.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-10-14 08:41:38 +02:00

material_synth.dm

Changes reinforced glass material name

2015-08-03 23:01:34 -04:00

materials.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-10-14 08:41:38 +02:00