cacklingfiend/bzgas2
1
0
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Fix early tech tree and K2 matter recipe generation #2

Open
pla wants to merge 3 commits from pla/bzgas2:pla-fixes into main
pull from: pla/bzgas2:pla-fixes
merge into: cacklingfiend:main
Conversation 0 Commits 3 Files changed 9 +43 -28
pla commented 2025-10-28 10:07:05 +01:00
First-time contributor
Copy link

image
image

![image](/attachments/a6bceac6-9ccb-4cf0-8a7e-4e8cdf8ae6d7) ![image](/attachments/475957cc-70b6-4beb-ac2a-69b82bd3c448)
image.png
201 KiB
image.png
64 KiB
pla added 2 commits 2025-10-28 10:07:05 +01:00
pla added 1 commit 2025-10-31 17:29:59 +01:00
This pull request has changes conflicting with the target branch.
  • bzgas2/data-final-fixes.lua
  • bzgas2/prototypes/gas-extractor.lua
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u pla-fixes:pla-pla-fixes
git checkout pla-pla-fixes

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 checkout main
git merge --no-ff pla-pla-fixes
git checkout pla-pla-fixes
git rebase main
git checkout main
git merge --ff-only pla-pla-fixes
git checkout pla-pla-fixes
git rebase main
git checkout main
git merge --no-ff pla-pla-fixes
git checkout main
git merge --squash pla-pla-fixes
git checkout main
git merge --ff-only pla-pla-fixes
git checkout main
git merge pla-pla-fixes
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
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: cacklingfiend/bzgas2#2
No description provided.
Delete branch "pla/bzgas2:pla-fixes"

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?