update sandwiches #3683
Labels
No Label
1. kind/balancing
1. kind/breaking
1. kind/bug
1. kind/construction
1. kind/documentation
1. kind/enhancement
1. kind/griefing
1. kind/invalid
1. kind/meme
1. kind/node limit
1. kind/other
1. kind/protocol
2. prio/controversial
2. prio/critical
2. prio/elevated
2. prio/good first issue
2. prio/interesting
2. prio/low
3. source/art
3. source/client
3. source/engine
3. source/ingame
3. source/integration
3. source/lag
3. source/license
3. source/mod upstream
3. source/unknown
3. source/website
4. step/approved
4. step/at work
4. step/blocked
4. step/discussion
4. step/help wanted
4. step/needs confirmation
4. step/partially fixed
4. step/question
4. step/ready to deploy
4. step/ready to QA test
4. step/want approval
5. result/cannot reproduce
5. result/duplicate
5. result/fixed
5. result/maybe
5. result/wontfix
ugh/petz
ugh/QA main
ugh/QA NOK
ugh/QA OK
No Milestone
No project
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies
No dependencies set.
Reference: your-land/bugtracker#3683
Loading…
Reference in New Issue
No description provided.
Delete Branch "%!s(<nil>)"
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?
to try to make sure 1.1.118 stuff is ready soon, i've started working on updating sandwiches. a review of our changes to the mod found that pretty much all our custom changes are already in the mod or irrelevant. it still needs testing, though, particularly the integration stuff.
upstream issue: https://notabug.org/Annalysa/sandwiches/issues/2
another upstream issue: https://notabug.org/Annalysa/sandwiches/issues/3
upstream PR: https://notabug.org/Annalysa/sandwiches/pulls/4
upstream is ready to be pulled
updated our integration code for new sandwiches (should continue to work w/ old ones too)
e2ea43b067
All we need to do is pull sandwiches, right? All the integration stuff is waiting for upstream sandwiches? No special commits to sandwiches anymore?
yup, no need to merge all the custom changes we made to the mod, we should just use the upstream code as it is.
QA
Except #4184 : NICE!
this is live =D