Timothy Teakettle 7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes

2020-06-15 22:48:26 +01:00

..

glass.dm

first port

2020-06-10 20:33:01 +01:00

leather.dm

Ports TG Icemoon framework and map (#49680) (#12002)

2020-05-07 14:46:16 +02:00

light.dm

Standardises all files from CRLF to LF

2020-01-12 14:28:01 +00:00

mineral.dm

Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS.

2020-05-02 00:00:49 +02:00

sheet_types.dm

[Ready] Improvised Weapons Update: Part 2 (#12386)

2020-06-12 13:38:27 -07:00

sheets.dm

Fixing some issues with the now unneeded hack for looms. (#12350)

2020-05-28 00:37:22 -07:00