Ed 04d29b6268 Merge remote-tracking branch 'upstream/master' into ed-17-06-2024-upstream ...

# Conflicts:
#	Resources/Prototypes/Maps/oasis.yml

2024-06-17 14:20:38 +03:00

..

Clothing

Makes Eyepatches Flippable (#26277)

2024-06-16 23:21:29 -04:00

Debugging

add noSpawn: true to tippy (#27538)

2024-05-01 01:07:30 +03:00

Effects

Cleans up some entity-related spawnmenu stuff (#28234)

2024-05-27 17:59:10 -04:00

Markers

Implement map text (#28705)

2024-06-09 15:18:54 -04:00

Mobs

Merge remote-tracking branch 'upstream/master' into ed-17-06-2024-upstream

2024-06-17 14:20:38 +03:00

Objects

Merge remote-tracking branch 'upstream/master' into ed-17-06-2024-upstream

2024-06-17 14:20:38 +03:00

Stations

Adds 2 new space ruins (#28971)

2024-06-15 00:02:56 -06:00

Structures

Merge remote-tracking branch 'upstream/master' into ed-17-06-2024-upstream

2024-06-17 14:20:38 +03:00

Tiles

Chasms (#224)

2024-06-07 01:24:39 +03:00

Virtual

Atmos device performance improvements (#26493)

2024-03-30 15:17:53 +11:00

World

Adds minable salt "ore" (#25324)

2024-02-26 16:34:15 -07:00

categories.yml

make objectives use entityCategory (#28269)

2024-06-03 09:23:52 -04:00

foldable.yml

Resolves FoldableVisualizer is Obsolete (#13913)

2023-02-06 15:53:07 -04:00