Undid edits

[nullified33]

A quick checklist

• If there's a existing issue, please link to it. If not, provide fill out the same information you would in a normal issue - reproduction steps for bugs, rationale for use-case.
• If you're working on CraftOS, try to write a few test cases so we can ensure everything continues to work in the future. Tests live in src/test/resources/test-rom/spec and can be run with ./gradlew check.

[toad-dev]

What is the point of this PR? Outside of the texture changes and some string edits to adventure.lua (are those from upstream of just arbitrary changes?), this PR only contains other PRs that have already been merged (from my repo).

There are a few new commits from Merith-TK's patchwork project that you pulled, but those could be pulled into here more directly when Merith-TK is ready.

[nullified33]

What is the point of this PR? Outside of the texture changes and some string edits to adventure.lua (are those from upstream of just arbitrary changes?), this PR only contains other PRs that have already been merged (from my repo).

There are a few new commits from Merith-TK's patchwork project that you pulled, but those could be pulled into here more directly when Merith-TK is ready.

Tweaked some stuff in adventure

[nullified33]

i probably will edit more stuff later on

[toad-dev]

Is it from upstream (the forge CC: Tweaked project)?

[nullified33]

no

[nullified33]

Upstream from Merith-TK

[nullified33]

Also weirldy enough, my readme has no conflicts, but Merith-TK's does

[Technici4n]

Are you applying the updates by hand instead of properly merging the relevant commits?

[toad-dev]

Yeah these appear to @Merith-TK commits that are copy pasted and recommitted.

[nullified33]

Yeah these appear to @Merith-TK commits that are copy pasted and recommitted.

recently i undid a lot of them

[Merith-TK]

I would request you to stop what you are doing, if you wanted my work added to this repo, you should've requested me to make a PR.

Also, these forks are feature Parity forks. Meaning that they intend to have the features and functions as the mainstream CC:Tweaked.

Any and all changes that are not directly a quilt related bug fix. Are to go to CC:T, not here.

[Merith-TK]

Also. I would appreciate it if you would not steal code I have written for CC:Restiched, and simply rebrand it as your own fork. Also I'm pretty sure that violates liscencing, I may be wrong,

It is still morally unethical to take someone else's work and brand it as your own.

[nullified33]

Also. I would appreciate it if you would not steal code I have written for CC:Restiched, and simply rebrand it as your own fork. Also I'm pretty sure that violates liscencing, I may be wrong,

It is still morally unethical to take someone else's work and brand it as your own.

i undid that code and sorry

[nullified33]

https://github.com/3prm3/cc-retweaked/commit/d890bfef0c11cc3581d4bea351f4f95a811956d6

[nullified33]

https://github.com/3prm3/cc-retweaked/commit/d5228bde2ff9dbbd9f0e4b8fb2fa72be7070a5ab

[nullified33]

ill delete the branch

[Merith-TK]

I would also reccomend learning to use git a bit more before attempting a PR like this.

As with git, if your fork is out of date and you made edits. Odds are, you can merge the latest version with your current version, assuming there are no conflicts in the edits.

[nullified33]

I would also reccomend learning to use git a bit more before attempting a PR like this.

As with git, if your fork is out of date and you made edits. Odds are, you can merge the latest version with your current version, assuming there are no conflicts in the edits.

thanks

[nullified33]

I would also reccomend learning to use git a bit more before attempting a PR like this.

As with git, if your fork is out of date and you made edits. Odds are, you can merge the latest version with your current version, assuming there are no conflicts in the edits.

good luck with your fork

[nullified33]

I would also reccomend learning to use git a bit more before attempting a PR like this.

As with git, if your fork is out of date and you made edits. Odds are, you can merge the latest version with your current version, assuming there are no conflicts in the edits.

nah i use desktop, git i have but is probably outdated or something like that

[Merith-TK]

You need to learn how to use git before contributing to a larger project like this with multiple devs.

Otherwise your PR's won't be accepted. Looking at your commits here, this appears to be a clusterfuck of commits.

[Merith-TK]

Try using Git Kraken. It works well and is what I use for my git code maintenance

[nullified33]

You need to learn how to use git before contributing to a larger project like this with multiple devs.

Otherwise your PR's won't be accepted. Looking at your commits here, this appears to be a clusterfuck of commits.

ok

[nullified33]

Try using Git Kraken. It works well and is what I use for my git code maintenance

also ill try it

[nullified33]

is it this https://www.gitkraken.com/

[nullified33]

I would request you to stop what you are doing, if you wanted my work added to this repo, you should've requested me to make a PR.

Also, these forks are feature Parity forks. Meaning that they intend to have the features and functions as the mainstream CC:Tweaked.

Any and all changes that are not directly a quilt related bug fix. Are to go to CC:T, not here.

pr failed cause of some readme thing, that is why i copied and pasted

[nullified33]

also github gave me a "this branch already exsists" error

[shedaniel]

please move elsewhere for the discussion, ill be locking this