• This project
    • Loading...
  • Sign in

tome / Tales of MajEyal · Merge Requests

GitLab

  • Go to group
  • Project
  • Activity
  • Files
  • Commits
  • Builds 0
  • Graphs
  • Milestones
  • Merge Requests 55
  • Labels
  • Forks
  • Snippets
  • Network
Merged
MR Merge Request !766 opened
2021-07-15 22:32:08 UTC by K'van @nsrr

Fix Call of the Ooze on_pre_use

Update Call of the Ooze on_pre_use to check your number of total summons vs the limit allowed by Mitosis (Call of the Ooze's own limit is still checked in the action), so it can be used if you already have one or more oozes but do not have max summons or the max oozes allowed by mitosis.

Edited 2021-07-27 13:30:58 UTC
Request to merge nsrr:fix-call-ooze-preuse into master
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://git.net-core.org/nsrr/t-engine4.git fix-call-ooze-preuse
git checkout -b nsrr/t-engine4-fix-call-ooze-preuse FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff nsrr/t-engine4-fix-call-ooze-preuse

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines

CI build passed for 73cb9b01. View details
CI build skipped for 73cb9b01. View details
CI build canceled for 73cb9b01. View details
CI build failed for 73cb9b01. View details
CI build running for 73cb9b01. View details
CI build pending for 73cb9b01. View details

Merged by DarkGod 2021-07-27 13:30:58 UTC

  • Discussion 0
  • Commits 1
  • Builds 0
  • Changes 1
  • DarkGod
    @darkgod commented 2021-07-27 13:30:57 UTC

    mentioned in commit 6ff9d4ca

  • DarkGod
    @darkgod commented 2021-07-27 13:30:58 UTC

    Status changed to merged

  • Please register or login to post a comment
766 of 849
Prev Next
Assignee
No assignee
Assign to
No
Milestone
None
Assign milestone
0
Labels
None
Assign labels
  • View labels
2
2 participants
Reference: tome/t-engine4!766
×

Revert this merge request

Cancel
A new branch will be created in your fork and a new merge request will be started.