VigersRay 940710da9e Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Textures/Tiles/attributions.yml # Resources/Textures/Tiles/green_circuit.png # Resources/Textures/Tiles/steel.png		2024-10-02 15:50:00 +03:00
..
floors.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-02 15:50:00 +03:00
planet.yml	Removes Trials of Mana grassland sprites: Bare Minimum Edition (#28868)	2024-06-11 23:04:43 -07:00
plating.yml	Clockwork structures and furniture (#24673)	2024-03-06 03:25:59 +03:00
space.yml	Localize tile names (#11060)	2022-09-14 12:53:37 +10:00
tile_migrations.yml	Add missing tile migration for glass alt > alt (#19940)	2023-09-09 01:37:12 -06:00