mnivoliez/oxycraft
1
0
Fork 0
Code Issues 9 Pull requests 1 Projects Releases Packages Wiki Activity Actions

WIP: Draft: Resolve "Anvil loader" #11

Draft
mnivoliez wants to merge 2 commits from 1-anvil-loader into master
pull from: 1-anvil-loader
merge into: mnivoliez:master
Conversation 6 Commits 2 Files changed 5 +70
mnivoliez commented 2021-06-20 11:37:16 +00:00 (Migrated from gitlab.deep-nope.me)
Copy link

Closes #1

Closes #1
mnivoliez commented 2021-06-20 11:42:31 +00:00 (Migrated from gitlab.deep-nope.me)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>6ff955c3 - 1 commit from branch <code>master</code></li></ul> [Compare with previous version](/mnivoliez/oxycraft/-/merge_requests/2/diffs?diff_id=72&start_sha=6ff6ce5c590f6f3b6b2a2c466e5a22fdde2e31d9)
mnivoliez commented 2021-09-06 12:37:12 +00:00 (Migrated from gitlab.deep-nope.me)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>1eada76a - Add anvil resources manager</li></ul> [Compare with previous version](/mnivoliez/oxycraft/-/merge_requests/2/diffs?diff_id=73&start_sha=6ff955c303188fa02a8db9a66dbcd9f712fe6777)
mnivoliez commented 2021-09-06 13:26:31 +00:00 (Migrated from gitlab.deep-nope.me)
Copy link

added 1 commit

  • f32284f2 - Remove absolute path from test, stopped testing anvil framework

Compare with previous version

added 1 commit <ul><li>f32284f2 - Remove absolute path from test, stopped testing anvil framework</li></ul> [Compare with previous version](/mnivoliez/oxycraft/-/merge_requests/2/diffs?diff_id=75&start_sha=1eada76aaa4897bf5dc611d90c8198e502cf2620)
SarahGreyWolf commented 2021-10-11 16:52:21 +00:00 (Migrated from gitlab.deep-nope.me)
Copy link

Should be spelt Chunk

Should be spelt Chunk
mnivoliez commented 2021-10-11 18:05:56 +00:00 (Migrated from gitlab.deep-nope.me)
Copy link

True, I'll correct that when I can. Still sting a little bit though....

True, I'll correct that when I can. Still sting a little bit though....
SarahGreyWolf commented 2021-10-12 02:56:20 +00:00 (Migrated from gitlab.deep-nope.me)
Copy link

I mostly mentioned it because I wanted to understand how commenting on code works on gitlab and needed an example, it's not something I was pointing out on purpose xD

I mostly mentioned it because I wanted to understand how commenting on code works on gitlab and needed an example, it's not something I was pointing out on purpose xD
This pull request is marked as a work in progress.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 1-anvil-loader:1-anvil-loader
git switch 1-anvil-loader

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 1-anvil-loader
git switch 1-anvil-loader
git rebase master
git switch master
git merge --ff-only 1-anvil-loader
git switch 1-anvil-loader
git rebase master
git switch master
git merge --no-ff 1-anvil-loader
git switch master
git merge --squash 1-anvil-loader
git switch master
git merge --ff-only 1-anvil-loader
git switch master
git merge 1-anvil-loader
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Architecture

   
AssetManagement

   
Bug

   
Documentation

   
Doing

   
Gameplay

   
Networking

   
Rendering

   
Technical debt

   
To review
No labels
Architecture
AssetManagement
Bug
Documentation
Doing
Gameplay
Networking
Rendering
Technical debt
To review
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
mnivoliez/oxycraft!11
No description provided.