Wuzzy/pride_flags
2
8
Fork
You've already forked pride_flags
6

Use MCL/VL iron ingots for the flag pole if available #32

Open
rudzik8 wants to merge 1 commit from rudzik8/pride_flags:mcl_vl_support_bare into master
pull from: rudzik8/pride_flags:mcl_vl_support_bare
merge into: Wuzzy:master
Wuzzy:master
Wuzzy:all_wuzzy_updates
Wuzzy:stuff
Wuzzy:newflags
Wuzzy:hidden
First-time contributor
Copy link

Alternative to #33.

This PR gives the easiest possible solution to the problem of MCL/VL crafting compatibility by just expanding the already given if statement.
mcl_core check is done before default specifically so that e.g. cora's default lite doesn't get caught up in the check.
MCL/VL iron ingots are treated as equivalent to MTG steel ones.

Alternative to #33. This PR gives the easiest possible solution to the problem of MCL/VL crafting compatibility by just expanding the already given if statement. `mcl_core` check is done before `default` specifically so that e.g. [cora's `default` lite](https://codeberg.org/cora/default_lite) doesn't get caught up in the check. MCL/VL iron ingots are treated as equivalent to MTG steel ones.
This commit gives the easiest possible solution to the problem of MCL/VL crafting compatibility by just expanding the already given if statement.
`mcl_core` check is done before `default` specifically so that e.g. <https://codeberg.org/cora/default_lite> doesn't get caught up in the check.
MCL/VL iron ingots are treated as equivalent to MTG steel ones.
Owner
Copy link

I appreciate the effort.
Will look at it later.

I appreciate the effort. Will look at it later.
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u mcl_vl_support_bare:rudzik8-mcl_vl_support_bare
git switch rudzik8-mcl_vl_support_bare

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff rudzik8-mcl_vl_support_bare
git switch rudzik8-mcl_vl_support_bare
git rebase master
git switch master
git merge --ff-only rudzik8-mcl_vl_support_bare
git switch rudzik8-mcl_vl_support_bare
git rebase master
git switch master
git merge --no-ff rudzik8-mcl_vl_support_bare
git switch master
git merge --squash rudzik8-mcl_vl_support_bare
git switch master
git merge --ff-only rudzik8-mcl_vl_support_bare
git switch master
git merge rudzik8-mcl_vl_support_bare
git push origin master
Sign in to join this conversation.
No reviewers
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
Wuzzy/pride_flags!32
Reference in a new issue
Wuzzy/pride_flags
No description provided.
Delete branch "rudzik8/pride_flags:mcl_vl_support_bare"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?