JerryImMouse f76d1edf27 Merge remote-tracking branch 'upstream/master' into upstream ... # Conflicts: # Content.Shared/Humanoid/NamingSystem.cs # Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs # Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs # Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml # Resources/ServerInfo/Guidebook/Service/Botany.xml # Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/eggy.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/steelcap.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/slice.png # Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/singularitygrenade.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/whiteholegrenade.rsi/meta.json # Resources/Textures/Structures/Furniture/rollerbeds.rsi/meta.json # Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json		2025-03-27 23:01:47 +05:00
..
IPIntel	Fix IPIntel causing frequent errors with the cleanup job. (#34428)	2025-01-14 21:38:26 +01:00
Whitelist	Cleanup: Remove redundant prototype name specifications (#35793)	2025-03-19 19:30:31 +01:00
ConnectionManager.cs	Merge remote-tracking branch 'upstream/master' into upstream	2025-03-18 02:40:46 +03:00
ConnectionManager.Whitelist.cs	Add IPIntel API support. (#33339)	2025-01-12 20:41:26 +01:00
GrantConnectBypassCommand.cs	Use moderator perms for grant_connect_bypass (#29406)	2024-06-24 23:56:29 +02:00
UserDataExt.cs	Integrate Modern HWID into content	2024-11-12 01:51:54 +01:00