Mineclonia
/
Mineclonia
Archived
12
17
Fork 13
Code Issues 105 Pull Requests 19 Projects Releases Wiki Activity

WIP: ITEMS/mcl_core: Add stripped wood blocks #120

Closed
erlehmann wants to merge 13 commits from stripped-wood-2 into master
pull from: stripped-wood-2
merge into: Mineclonia:master
Conversation 4 Commits 13 Files Changed 17 +169 -55
erlehmann commented 2021-07-13 10:50:56 +02:00
Owner
Copy Link
Problem

TRACKING ISSUE: #80

This PR is a refactoring of #86 to make it easier to review, get a nicer history, and hopefully add some tests.

Solution
Details
Testing Steps
To do
  • Fill out PR template
  • Write comprehensive testing instructions
  • Verify testing instructions
##### Problem TRACKING ISSUE: https://git.minetest.land/Mineclonia/Mineclonia/issues/80 This PR is a refactoring of https://git.minetest.land/Mineclonia/Mineclonia/pulls/86 to make it easier to review, get a nicer history, and hopefully add some tests. ##### Solution <!-- Describe HOW this pull request solves its problem. --> ##### Details <!-- Include any additional information here. --> ##### Testing Steps <!-- Write how we can verify this patch addresses its problem. If you need more steps, just keep adding numbers. If you don't need them all, delete the empty numbers. --> 1. 2. 3. <!-- If your pull request still needs work, uncomment the following section and include a list of things that need to be done before it's ready for us to look at. Please remember to put WIP: in front of the title as well. --> ##### To do - [ ] Fill out PR template - [ ] Write comprehensive testing instructions - [ ] Verify testing instructions
erlehmann added 17 commits 2021-07-13 10:50:58 +02:00
erlehmann added 13 commits 2021-07-13 10:52:06 +02:00
erlehmann commented 2021-07-13 10:53:06 +02:00
Author
Owner
Copy Link

I removed the merge commits with history rewriting, i.e. git rebase master.

I removed the merge commits with history rewriting, i.e. `git rebase master`.
erlehmann commented 2021-07-13 11:17:48 +02:00
Author
Owner
Copy Link

Some commit messages are not helpful and should be rewritten. The commits could be squashed, split up and/or reordered accordingly:

  • “Add stripped wood part1” adds debarking using axe
  • “Add stripped wood part2” adds stripped trunk and stripped wood
  • “Add stripped wood part3” refactors plank crafting so planks can be made out of stripped wood
  • “Add stripped wood part4” adds stripped acacia wood and stripped birch wood textures
  • “Add stripped wood part5” adds stripped stripped dark oak wood and stripped jungle wood textures
  • “Add stripped wood part6” adds stripped oak wood and stripped spruce wood textures
Some commit messages are not helpful and should be rewritten. The commits could be squashed, split up and/or reordered accordingly: * “Add stripped wood part1” adds debarking using axe * “Add stripped wood part2” adds stripped trunk and stripped wood * “Add stripped wood part3” refactors plank crafting so planks can be made out of stripped wood * “Add stripped wood part4” adds stripped acacia wood and stripped birch wood textures * “Add stripped wood part5” adds stripped stripped dark oak wood and stripped jungle wood textures * “Add stripped wood part6” adds stripped oak wood and stripped spruce wood textures
erlehmann commented 2021-07-13 11:21:07 +02:00
Author
Owner
Copy Link

The commits “Remove misspellings part1” and “Remove misspellings part2” can be folded into the previous changes using history rewriting.

The commits “Remove misspellings part1” and “Remove misspellings part2” can be folded into the previous changes using history rewriting.
erlehmann commented 2021-07-31 21:26:48 +02:00
Author
Owner
Copy Link

Closed in favor of PR: #135

Closed in favor of PR: https://git.minetest.land/Mineclonia/Mineclonia/pulls/135
erlehmann closed this pull request 2021-07-31 21:26:49 +02:00
This repo is archived. You cannot comment on pull requests.
Reviewers
No reviewers
Labels
Clear labels   
blocker

blocks release until resolved

  
bug

   
code quality

   
confirmed

   
critical

crashes, catastrophic bugs

  
discussion

   
high priority

   
incompatibility

incompatible with mcl2

  
incomplete feature

   
invalid

   
low priority

   
missing feauture

   
needs testing

   
packet spam

   
performance

   
project

meta-issues

  
regression

   
translations

   
unconfirmed
  
in review

   
ready for review
No Label
blocker
bug
code quality
confirmed
critical
discussion
high priority
incompatibility
incomplete feature
invalid
low priority
missing feauture
needs testing
packet spam
performance
project
regression
translations
unconfirmed
in review
ready for review
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
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: Mineclonia/Mineclonia#120
No description provided.
Delete Branch "stripped-wood-2"

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?