Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport #70843 #73878

Merged
merged 1 commit into from
May 18, 2024
Merged

Backport #70843 #73878

merged 1 commit into from
May 18, 2024

Conversation

Procyonae
Copy link
Contributor

Summary

None

Purpose of change

Labelled for backport

Describe the solution

Backport non-MoM changes from #70843, MoM changes will be included in #73842 instead

Describe alternatives you've considered

Testing

Additional context

@Procyonae Procyonae changed the base branch from master to 0.H-branch May 17, 2024 12:22
@github-actions github-actions bot added Info / User Interface Game - player communication, menus, etc. Translation I18n Code: Build Issues regarding different builds and build environments [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding Missions Quests and missions labels May 17, 2024
@github-actions github-actions bot requested a review from Maleclypse May 17, 2024 12:22
@github-actions github-actions bot added Map / Mapgen Overmap, Mapgen, Map extras, Map display Spawn Creatures, items, vehicles, locations appearing on map Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies [C++] Changes (can be) made in C++. Previously named `Code` Monsters Monsters both friendly and unfriendly. Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves [Python] Code made in Python Mods: Magiclysm Anything to do with the Magiclysm mod Code: Tooling Tooling that is not part of the main game but is part of the repo. Mechanics: Enchantments / Spells Enchantments and spells EOC: Effects On Condition Anything concerning Effects On Condition Mods: Xedra Evolved Anything to do with Xedra Evolved Mods: Mind Over Matter labels May 17, 2024
@dseguin dseguin merged commit 062e42e into CleverRaven:0.H-branch May 18, 2024
6 of 7 checks passed
@Procyonae Procyonae deleted the Backport70843 branch December 1, 2024 12:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Maleclypse Maleclypse Awaiting requested review from Maleclypse

Assignees
No one assigned
Labels
[C++] Changes (can be) made in C++. Previously named `Code` Code: Build Issues regarding different builds and build environments Code: Tooling Tooling that is not part of the main game but is part of the repo. EOC: Effects On Condition Anything concerning Effects On Condition Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Info / User Interface Game - player communication, menus, etc. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display Mechanics: Enchantments / Spells Enchantments and spells Missions Quests and missions Mods: Magiclysm Anything to do with the Magiclysm mod Mods: Mind Over Matter Mods: Xedra Evolved Anything to do with Xedra Evolved Mods Issues related to mods or modding Monsters Monsters both friendly and unfriendly. Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies [Python] Code made in Python Spawn Creatures, items, vehicles, locations appearing on map Translation I18n
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Procyonae @dseguin @BrettDong