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.

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

Move changes from main to develop #4095

Merged
merged 27 commits into from
Feb 3, 2025

Conversation

AbnormalPoof
Copy link
Collaborator

Basically just documentation and actions stuff

(Reopened because I couldn't resolve the conflicts lol)

EliteMasterEric and others added 26 commits October 11, 2024 23:57
* changelog sweep

* Resolve a few conflicts

* Resolve more conflicts

* DadBattle

* Re-add @ianharrigan

* Add links to 0.5.0

* Add links and contributors to 0.4.1 and 0.4.0

* Add links to 0.3.3 and finishing touches

* Add and polish 0.5.3 changes

* Make spacing consistent
* Make label actions more convenient

* chore: Add status: planned to label actions
… by default (this re-enables the Stage Editor keybind).
… to 0.5.3) (FunkinCrew#3834)

* Create Charting Issue template

* Include images and videos in charting issue template

* Update version in bug report template

* Update version in crash report template
* Create compiling.yml

* Update compiling.yml

* Update compiling.yml

* Update compiling.yml

* Update compiling.yml

* Update compiling.yml

* charting (Hundrec)

thanks hundrec i like this

* Delete .github/ISSUE_TEMPLATE/charting.yml
* Add `status: pending triage` to all PRs

* Update label-pull-request.yml

* now size and pr labels can be updated every commit!

* remove this

* move the pending triage thing to a new workflow

* Rename label-pr-on-create.yml to label-pull-request-on-create.yml

* fix the identation on this

* almost forgot to remove this

---------

Co-authored-by: Abnormal <[email protected]>
* Issues Guide in bug template

* Issues Guide in charting template

* Guide links in compiling template

* Issues Guide in crash template

* Issues Guide in enhancement template
@AbnormalPoof AbnormalPoof added status: pending triage Awaiting review. pr: documentation PR modifies documentation or README files. pr: github PR modifies GitHub metadata files. type: github Relates to the management of issues and pull requests on GitHub. size: large A large pull request with more than 100 changes. labels Feb 3, 2025
@github-actions github-actions bot added large and removed large labels Feb 3, 2025
@EliteMasterEric EliteMasterEric merged commit 796cbb3 into FunkinCrew:develop Feb 3, 2025
3 checks passed
@Hundrec Hundrec added status: accepted PR was approved for contribution. If it's not already merged, it may be merged on a private branch. and removed status: pending triage Awaiting review. labels Feb 3, 2025
@AbnormalPoof AbnormalPoof deleted the main-to-develop branch February 3, 2025 23:25
@NotHyper-474
Copy link
Contributor

Thank god

@Hundrec Hundrec removed the request for review from EliteMasterEric February 4, 2025 01:25
@Hundrec Hundrec added this to the 0.6.0 (Pit Stop 2) milestone Feb 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr: documentation PR modifies documentation or README files. pr: github PR modifies GitHub metadata files. size: large A large pull request with more than 100 changes. status: accepted PR was approved for contribution. If it's not already merged, it may be merged on a private branch. type: github Relates to the management of issues and pull requests on GitHub.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants