Take note of what mod the item is from and close minecraft. Then what you have to do is either a) delete the mod the item came from or if you are really advanced (a.k.a capable of developing your own mod from scratch) b) actually modify the mod itself and reassign the conflicting item a new ID.
TylerH16.3k1010 gold badges5656 silver badges7171 bronze badges
SpoikeSpoike62.2k3737 gold badges128128 silver badges152152 bronze badges
34 Answers
12 next
Try:
git mergetool
It opens a GUI that steps you through each conflict, and you get to choose how to merge. Sometimes it requires a bit of hand editing afterwards, but usually it's enough by itself. It is much better than doing the whole thing by hand certainly.
As per @JoshGlover comment:
The command doesn't necessarily open a GUI unless you install one. Running
git mergetool
for me resulted in vimdiff
being used. You can install one of the following tools to use it instead: meld
, opendiff
, kdiff3
, tkdiff
, xxdiff
, tortoisemerge
, gvimdiff
, diffuse
, ecmerge
, p4merge
, araxis
, vimdiff
, emerge
.Below is the sample procedure to use
vimdiff
for resolve merge conflicts. Based on this linkStep 1: Run following commands in your terminal
This will set vimdiff as the default merge tool.
Step 2: Run following command in terminal
Step 3: You will see a vimdiff display in following format
These 4 views are
LOCAL – this is file from the current branch
BASE – common ancestor, how file looked before both changes
REMOTE – file you are merging into your branch
MERGED – merge result, this is what gets saved in the repo
You can navigate among these views using ctrl+w. You can directly reach MERGED view using ctrl+w followed by j.
More info about vimdiff navigation here and here
Step 4. You could edit the MERGED view the following way
If you want to get changes from REMOTE
If you want to get changes from BASE
If you want to get changes from LOCAL
Step 5. Save, Exit, Commit and Clean up
:wqa
save and exit from vigit commit -m 'message'
git clean
Remove extra files (e.g. *.orig) created by diff tool.2,47033 gold badges1010 silver badges3030 bronze badges
Peter BurnsPeter Burns35.8k77 gold badges3131 silver badges5353 bronze badges
Here's a probable use-case, from the top:
You're going to pull some changes, but oops, you're not up to date:
So you get up-to-date and try again, but have a conflict:
So you decide to take a look at the changes:
Oh my, oh my, upstream changed some things, but just to use my changes...no...their changes...
And then we try a final time
Ta-da!
Script4710.4k44 gold badges2626 silver badges4949 bronze badges
CoolAJ86CoolAJ8651.3k1010 gold badges6666 silver badges8383 bronze badges
I find merge tools rarely help me understand the conflict or the resolution. I'm usually more successful looking at the conflict markers in a text editor and using git log as a supplement.
Here are a few tips:
The best thing I have found is to use the 'diff3' merge conflict style:
![How To Resolve Id Conflicts Quickly Minecraft How To Resolve Id Conflicts Quickly Minecraft](/uploads/1/2/6/2/126227674/375983150.jpg)
git config merge.conflictstyle diff3
This produces conflict markers like this:
The middle section is what the common ancestor looked like. This is useful because you can compare it to the top and bottom versions to get a better sense of what was changed on each branch, which gives you a better idea for what the purpose of each change was.
If the conflict is only a few lines, this generally makes the conflict very obvious. (Knowing how to fix a conflict is very different; you need to be aware of what other people are working on. If you're confused, it's probably best to just call that person into your room so they can see what you're looking at.)
If the conflict is longer, then I will cut and paste each of the three sections into three separate files, such as 'mine', 'common' and 'theirs'.
Then I can run the following commands to see the two diff hunks that caused the conflict:
This is not the same as using a merge tool, since a merge tool will include all of the non-conflicting diff hunks too. I find that to be distracting.
Somebody already mentioned this, but understanding the intention behind each diff hunk is generally very helpful for understanding where a conflict came from and how to handle it.
This shows all of the commits that touched that file in between the common ancestor and the two heads you are merging. (So it doesn't include commits that already exist in both branches before merging.) This helps you ignore diff hunks that clearly are not a factor in your current conflict.
Verify your changes with automated tools.
If you have automated tests, run those. If you have a lint, run that. If it's a buildable project, then build it before you commit, etc. In all cases, you need to do a bit of testing to make sure your changes didn't break anything. (Heck, even a merge without conflicts can break working code.)
Plan ahead; communicate with co-workers.
Planning ahead and being aware of what others are working on can help prevent merge conflicts and/or help resolve them earlier -- while the details are still fresh in mind.
For example, if you know that you and another person are both working on different refactoring that will both affect the same set of files, you should talk to each other ahead of time and get a better sense for what types of changes each of you is making. You might save considerable time and effort if you conduct your planned changes serially rather than in parallel.
For major refactorings that cut across a large swath of code, you should strongly consider working serially: everybody stops working on that area of the code while one person performs the complete refactoring.
If you can't work serially (due to time pressure, maybe), then communicating about expected merge conflicts at least helps you solve the problems sooner while the details are still fresh in mind. For example, if a co-worker is making a disruptive series of commits over the course of a one-week period, you may choose to merge/rebase on that co-workers branch once or twice each day during that week. That way, if you do find merge/rebase conflicts, you can solve them more quickly than if you wait a few weeks to merge everything together in one big lump.
If you're unsure of a merge, don't force it.
Merging can feel overwhelming, especially when there are a lot of conflicting files and the conflict markers cover hundreds of lines. Often times when estimating software projects we don't include enough time for overhead items like handling a gnarly merge, so it feels like a real drag to spend several hours dissecting each conflict.
In the long run, planning ahead and being aware of what others are working on are the best tools for anticipating merge conflicts and prepare yourself to resolve them correctly in less time.
Peter Mortensen14.2k1919 gold badges8888 silver badges114114 bronze badges
Mark E. HaaseMark E. Haase19k66 gold badges5252 silver badges6262 bronze badges
- Identify which files are in conflict (Git should tell you this).
- Open each file and examine the diffs; Git demarcates them. Hopefully it will be obvious which version of each block to keep. You may need to discuss it with fellow developers who committed the code.
- Once you've resolved the conflict in a file
git add the_file
. - Once you've resolved all conflicts, do
git rebase --continue
or whatever command Git said to do when you completed.
user456814
davetron5000davetron500016.7k99 gold badges5858 silver badges9292 bronze badges
Check out the answers in Stack Overflow question Aborting a merge in Git, especially Charles Bailey's answer which shows how to view the different versions of the file with problems, for example,
Community♦
Pat NotzPat Notz137k2828 gold badges8282 silver badges9090 bronze badges
Merge conflicts happens when changes are made to a file at the same time. Here is how to solve it.
git
CLI
Here are simple steps what to do when you get into conflicted state:
- Note the list of conflicted files with:
git status
(underUnmerged paths
section). - Solve the conflicts separately for each file by one of the following approaches:
- Use GUI to solve the conflicts:
git mergetool
(the easiest way). - To accept remote/other version, use:
git checkout --theirs path/file
. This will reject any local changes you did for that file. - To accept local/our version, use:
git checkout --ours path/file
However you've to be careful, as remote changes that conflicts were done for some reason.Related: What is the precise meaning of 'ours' and 'theirs' in git? - Edit the conflicted files manually and look for the code block between
<<<<<
/>>>>>
then choose the version either from above or below . See: How conflicts are presented. - Path and filename conflicts can be solved by
git add
/git rm
.
- Finally, review the files ready for commit using:
git status
.If you still have any files underUnmerged paths
, and you did solve the conflict manually, then let Git know that you solved it by:git add path/file
. - If all conflicts were solved successfully, commit the changes by:
git commit -a
and push to remote as usual.
See also: Resolving a merge conflict from the command line at GitHub
DiffMerge
I've successfully used DiffMerge which can visually compare and merge files on Windows, macOS and Linux/Unix.
It graphically can show the changes between 3 files and it allows automatic merging (when safe to do so) and full control over editing the resulting file.
Image source: DiffMerge (Linux screenshot)
Simply download it and run in repo as:
macOS
On macOS you can install via:
And probably (if not provided) you need the following extra simple wrapper placed in your PATH (e.g.
/usr/bin
):Then you can use the following keyboard shortcuts:
- ⌘-Alt-Up/Down to jump to previous/next changes.
- ⌘-Alt-Left/Right to accept change from left or right
Alternatively you can use opendiff (part of Xcode Tools) which lets you merge two files or directories together to create a third file or directory.
Community♦
kenorbkenorb76k3333 gold badges434434 silver badges452452 bronze badges
If you're making frequent small commits, then start by looking at the commit comments with
git log --merge
. Then git diff
will show you the conflicts.For conflicts that involve more than a few lines, it's easier to see what's going on in an external GUI tool. I like opendiff -- Git also supports vimdiff, gvimdiff, kdiff3, tkdiff, meld, xxdiff, emerge out of the box and you can install others:
git config merge.tool 'your.tool'
will set your chosen tool and then git mergetool
after a failed merge will show you the diffs in context.Each time you edit a file to resolve a conflict,
Peter Mortensengit add filename
will update the index and your diff will no longer show it. When all the conflicts are handled and their files have been git add
-ed, git commit
will complete your merge.14.2k1919 gold badges8888 silver badges114114 bronze badges
PaulPaul15.5k33 gold badges2727 silver badges2525 bronze badges
See How Conflicts Are Presented or, in Git, the
git merge
documentation to understand what merge conflict markers are.Also, the How to Resolve Conflicts section explains how to resolve the conflicts:
After seeing a conflict, you can do two things:
- Decide not to merge. The only clean-ups you need are to reset the index file to the
HEAD
commit to reverse 2. and to clean up working tree changes made by 2. and 3.;git merge --abort
can be used for this. - Resolve the conflicts. Git will mark the conflicts in the working tree. Edit the files into shape and
git add
them to the index. Usegit commit
to seal the deal.
You can work through the conflict with a number of tools:
- Use a mergetool.
git mergetool
to launch a graphical mergetool which will work you through the merge. - Look at the diffs.
git diff
will show a three-way diff, highlighting changes from both theHEAD
andMERGE_HEAD
versions. - Look at the diffs from each branch.
git log --merge -p <path>
will show diffs first for theHEAD
version and then theMERGE_HEAD
version. - Look at the originals.
git show :1:filename
shows the common ancestor,git show :2:filename
shows theHEAD
version, andgit show :3:filename
shows theMERGE_HEAD
version.
You can also read about merge conflict markers and how to resolve them in the Pro Git book section Basic Merge Conflicts.
Peter Mortensen14.2k1919 gold badges8888 silver badges114114 bronze badges
user456814
For Emacs users which want to resolve merge conflicts semi-manually:
shows all files which require conflict resolution.
Open each of those files one by one, or all at once by:
When visiting a buffer requiring edits in Emacs, type
This will open three buffers (mine, theirs, and the output buffer). Navigate by pressing 'n' (next region), 'p' (prevision region). Press 'a' and 'b' to copy mine or theirs region to the output buffer, respectively. And/or edit the output buffer directly.
When finished: Press 'q'. Emacs asks you if you want to save this buffer: yes.After finishing a buffer mark it as resolved by running from the teriminal:
When finished with all buffers type
to finish the merge.
Peter Mortensen14.2k1919 gold badges8888 silver badges114114 bronze badges
ecieci
I either want my or their version in full, or want to review individual changes and decide for each of them.
Fully accept my or theirs version:
Accept my version (local, ours):
Accept their version (remote, theirs):
If you want to do for all conflict files run:
or
Review all changes and accept them individually
git mergetool
- Review changes and accept either version for each of them.
git add <filename>
git commit -m 'merged bla bla'
Default
mergetool
works in command line. How to use a command line mergetool should be a separate question.You can also install visual tool for this, e.g.
meld
and runIt will open local version (ours), 'base' or 'merged' version (the current result of the merge) and remote version (theirs). Save the merged version when you are finished, run
Peter Mortensengit mergetool -t meld
again until you get 'No files need merging', then go to Steps 3. and 4.14.2k1919 gold badges8888 silver badges114114 bronze badges
NoideaNoidea
Please follow the following steps to fix merge conflicts in Git:
- Check the Git status:git status
- Get the patchset:git fetch (checkout the right patch from your Git commit)
- Checkout a local branch (temp1 in my example here):git checkout -b temp1
- Pull the recent contents from master:git pull --rebase origin master
- Start the mergetool and check the conflicts and fix them...and check the changes in the remote branch with your current branch:git mergetool
- Check the status again: git status
- Delete the unwanted files locally created by mergetool, usually mergetool creates extra file with *.orig extension. Please delete that file as that is just the duplicate and fix changes locally and add the correct version of your files.git add #your_changed_correct_files
- Check the status again:git status
- Commit the changes to the same commit id (this avoids a new separate patch set):git commit --amend
- Push to the master branch:git push (to your Git repository)
14.2k1919 gold badges8888 silver badges114114 bronze badges
ChhabilalChhabilal
Simply, if you know well that changes in one of the repositories is not important, and want to resolve all changes in favor of the other one, use:
to resolve changes in the favor of your repository, or
to resolve changes in favor of the other or the main repository.
Or else you will have to use a GUI merge tool to step through files one by one, say the merge tool is
p4merge
, or write any one's name you've already installedand after finishing a file, you will have to save and close, so the next one will open.
Peter Mortensen14.2k1919 gold badges8888 silver badges114114 bronze badges
Mohamed SelimMohamed Selim
Bonus:
In speaking of pull/fetch/merge in the above answers, I would like to share an interesting and productive trick,
This above command is the most useful command in my git life which saved a lots of time.
Before pushing your newly committed change to remote server, try
git pull --rebase
rather git pull
and manual merge
and it will automatically sync latest remote server changes (with a fetch + merge) and will put your local latest commit at the top in git log. No need to worry about manual pull/merge.In case of conflict, just use
Find details at: http://gitolite.com/git-pull--rebase
Sazzad Hissain KhanSazzad Hissain Khan16.7k99 gold badges7373 silver badges112112 bronze badges
You could fix merge conflicts in a number of ways as other have detailed.
I think the real key is knowing how changes flow with local and remote repositories. The key to this is understanding tracking branches. I have found that I think of the tracking branch as the 'missing piece in the middle' between me my local, actual files directory and the remote defined as origin.
I've personally got into the habit of 2 things to help avoid this.
Instead of:
Which has two drawbacks -
a) All new/changed files get added and that might include some unwanted changes.
b) You don't get to review the file list first.
b) You don't get to review the file list first.
So instead I do:
This way you are more deliberate about which files get added and you also get to review the list and think a bit more while using the editor for the message. I find it also improves my commit messages when I use a full screen editor rather than the
-m
option.[Update - as time has passed I've switched more to:
]
Also (and more relevant to your situation), I try to avoid:
or
because pull implies a merge and if you have changes locally that you didn't want merged you can easily end up with merged code and/or merge conflicts for code that shouldn't have been merged.
Instead I try to do
You may also find this helpful:
Community♦
Michael DurrantMichael Durrant60.8k6868 gold badges249249 silver badges374374 bronze badges
There are 3 steps:
- Find which files cause conflicts by command
- Check the files, in which you would find the conflicts marked like
- Change it to the way you want it, then commit with commands
3,87833 gold badges4343 silver badges6363 bronze badges
Qijun LiuQijun Liu91911 gold badge88 silver badges1111 bronze badges
CoolAJ86's answer sums up pretty much everything. In case you have changes in both branches in the same piece of code you will have to do a manual merge. Open the file in conflict in any text editor and you should see following structure.
Choose one of the alternatives or a combination of both in a way that you want new code to be, while removing equal signs and angle brackets.
Peter Mortensen14.2k1919 gold badges8888 silver badges114114 bronze badges
iankitiankit4,97377 gold badges3737 silver badges5252 bronze badges
Does not seem to always work for me and usually ends up displaying every commit that was different between the two branches, this happens even when using
--
to separate the path from the command.What I do to work around this issue is open up two command lines and in one run
and in the other
Replacing
$MERGED_IN_BRANCH
with the branch I merged in and [path]
with the file that is conflicting. This command will log all the commits, in patch form, between (..
) two commits. If you leave one side empty like in the commands above git will automatically use HEAD
(the branch you are merging into in this case).This will allow you to see what commits went into the file in the two branches after they diverged. It usually makes it much easier to solve conflicts.
stites1,84933 gold badges2121 silver badges4141 bronze badges
Brian Di PalmaBrian Di Palma5,00933 gold badges1414 silver badges1212 bronze badges
As of December 12th 2016, you can merge branches and resolve conflicts on github.com
Thus, if you don't want to use the command-line or any 3rd party tools that are offered here from older answers, go with GitHub's native tool.
This blog post explains in detail, but the basics are that upon 'merging' two branches via the UI, you will now see a 'resolve conflicts' option that will take you to an editor allowing you to deal with these merge conflicts.
maxwellmaxwell
Using patience
I'm surprised no one else spoke about resolving conflict using
patience
with the merge recursive strategy. For a big merge conflict, using patience
provided good results for me. The idea is that it will try to match blocks rather than individual lines.If you change the indentation of your program for instance, the default Git merge strategy sometimes matches single braces
{
which belongs to different functions. This is avoided with patience
:From the documentation:
Comparison with the common ancestor
If you have a merge conflict and want to see what others had in mind when modifying their branch, it's sometimes easier to compare their branch directly with the common ancestor (instead of our branch). For that you can use
merge-base
:Usually, you only want to see the changes for a particular file:
Peter Mortensen14.2k1919 gold badges8888 silver badges114114 bronze badges
ConchylicultorConchylicultor
I always follow the below steps to avoid conflicts.
- git checkout master (Come to the master branch)
- git pull (Update your master to get the latest code)
- git checkout -b mybranch (Checkout a new a branch and start working on that branch so that your master always remains top of trunk.)
- git add . AND git commit AND git push (on your local branch after your changes)
- git checkout master (Come back to your master.)
Now you can do the same and maintain as many local branches you want and work simultaneous my just doing a git checkout to your branch when ever necessary.
ChetanChetan61011 gold badge66 silver badges1717 bronze badges
If you want to merge from branch (test) to master, you can follow these steps:
Step 1: Go to the branch
Step 2:
git pull --rebase origin master
Step 3: If there are some conflicts, go to these files to modify it.
Step 4: Add these changes
Step 5:
git rebase --continue
Step 6: if there is still conflict, go back to step 3 again. If there is no conflict, do following:
git push origin +test
Step 7: And then there is no conflict between test and master. You can use merge directly.
Peter Mortensen14.2k1919 gold badges8888 silver badges114114 bronze badges
HaimeiHaimei9,21322 gold badges3333 silver badges3131 bronze badges
Merge conflicts could occur in different situations:
- When running 'git fetch' and then 'git merge'
- When running 'git fetch' and then 'git rebase'
- When running 'git pull' (which is actually equal to one of the above-mentioned conditions)
- When running 'git stash pop'
- When you're applying git patches (commits that are exported to files to be transferred, for example, by email)
You need to install a merge tool which is compatible with Git to resolve the conflicts. I personally use KDiff3, and I've found it nice and handy. You can download its Windows version here:
BTW if you install Git Extensions there is an option in its setup wizard to install Kdiff3.
Then setup git configs to use Kdiff as its mergetool:
(Remember to replace the path with the actual path of Kdiff exe file.)
Then every time you come across a merge conflict you just need to run this command:
Then it opens the Kdiff3, and first tries to resolve the merge conflicts automatically. Most of the conflicts would be resolved spontaneously and you need to fix the rest manually.
Here's what Kdiff3 looks like:
Then once you're done, save the file and it goes to the next file with conflict and you do the same thing again until all the conflicts are resolved.
To check if everything is merged successfully, just run the mergetool command again, you should get this result:
Peter Mortensen14.2k1919 gold badges8888 silver badges114114 bronze badges
akazemisakazemis16.1k33 gold badges1919 silver badges3232 bronze badges
This answers is to add an alternative for those VIM users like I that prefers to do everything within the editor.
Tpope came up with this great plugin for VIM called fugitive. Once installed you can run
:Gstatus
to check the files that have conflict and :Gdiff
to open Git in a 3 ways merge. Once in the 3-ways merge, fugitive will let you get the changes of any of the branches you are merging in the following fashion:
:diffget //2
, get changes from original (HEAD) branch::diffget //3
, get changes from merging branch:
Once you are finished merging the file, type
:Gwrite
in the merged buffer. Vimcasts released a great video explaining in detail this steps.Vicente Adolfo Bolea SánchezVicente Adolfo Bolea Sánchez
git fetch
git checkout your branch
git rebase master
git checkout your branch
git rebase master
In this step you will try to fix the conflict using your prefer IDE
You can follow this link to check ho to fix the conflict in the file
https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/
https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/
git add
git rebase --continue
git commit --amend
git push origin HEAD:refs/drafts/master (push like a drafts)
git rebase --continue
git commit --amend
git push origin HEAD:refs/drafts/master (push like a drafts)
Now every thing is fine and you will find your commit in gerrit
I hope that this will help every one concerning this issue.
Baini.MarouaneBaini.Marouane
Gitlense For VS Code
You can try Gitlense for VS Code, They key features are:
3. Easily Resolve Conflicts.
I already like this feature:
2. Current Line Blame.
3. Gutter Blame
4. Status Bar Blame
And there are many features you can check them here.
Ilyas karimIlyas karim1,54311 gold badge1717 silver badges2929 bronze badges
Try Visual Studio Code for editing if you aren't already.What it does is after you try merging(and land up in merge conflicts).VS code automatically detects the merge conflicts.
It can help you very well by showing what are the changes made to the original one and should you accept
incoming
or current change
(meaning original one before merging)'?.It helped for me and it can work for you too !
PS: It will work only if you've configured git with with your code and Visual Studio Code.
Kailash BhalakiKailash Bhalaki
A safer way to resolve conflicts is to use git-mediate (the common solutions suggested here are quite error prone imho).
See this post for a quick intro on how to use it.
yairchuyairchu15.8k77 gold badges5959 silver badges9696 bronze badges
For those who are using Visual Studio (2015 in my case)
- Close your project in VS. Especially in big projects VS tends to freak out when merging using the UI.
- Do the merge in command prompt.git checkout target_branchgit merge source_branch
- Then open the project in VS and go to Team Explorer -> Branch. Now there is a message that says Merge is pending and conflicting files are listed right below the message.
- Click the conflicting file and you will have the option to Merge, Compare, Take Source, Take Target. The merge tool in VS is very easy to use.
1,03011 gold badge1919 silver badges2626 bronze badges
If you are using intelliJ as IDETry to merge parent to your branch by
It will show all conflicts like this
A_MBPro:test anu$ git merge origin/ Auto-merging src/test/java/com/.../TestClass.java CONFLICT (content): Merge conflict in src/test/java/com/.../TestClass.java
Now note that the file TestClass.java is shown in red in intelliJAlso git status will show
Open the file in intelliJ, it will have sections with
where HEAD is changes on your local branch and origin/ is changes from the remote branch. Here keep the stuff that you need and remove the stuff you don't need.After that the normal steps should do. That is
AJCAJC
I follow the below process.
The process to fix merge conflict:
- First, pull the latest from the destination branch to which you want to merge
git pull origin develop
- As you get the latest from the destination, now resolve the conflict manually in IDE by deleting those extra characters.
- Do a
git add
to add these edited files to the git queue so that it can becommit
andpush
to the same branch you are working on. - As
git add
is done, do agit commit
to commit the changes. - Now push the changes to your working branch by
git push origin HEAD
This is it and you will see it resolved in your pull request if you are using Bitbucket or GitHub.
Melebius3,26033 gold badges2424 silver badges3636 bronze badges
Aniruddha DasAniruddha Das6,63899 gold badges5353 silver badges6565 bronze badges
12 next
protected by WillDec 17 '10 at 13:56
Thank you for your interest in this question. Because it has attracted low-quality or spam answers that had to be removed, posting an answer now requires 10 reputation on this site (the association bonus does not count).
Would you like to answer one of these unanswered questions instead?
Would you like to answer one of these unanswered questions instead?
Not the answer you're looking for? Browse other questions tagged gitgit-mergemerge-conflict-resolutiongit-merge-conflict or ask your own question.
Minecraft an open-world game that promotes creativity, collaboration, and problem-solving in an immersive environment where the only limit is your imagination.
Mods are add-ons allow changes Minecraft's game content from what it originally was. With Mods you can make your own world within Minecraft by programming a whole new set of rules and situations!
- Updated on: June 28, 2016
- Comments:
- Newest File: AntiIdConflict-1.5-1.10
- Release Type: Release
- Supports: 1.10,1.9.4,1.7.10
- License: All Rights Reserved
Anti Id Conflict Mod 1.10,1.9.4,1.7.10 helps you resolve id conflicts occuring between default configurations, by logging all ids and what they are occupied with.
AIC logs ids for: biomes, potions, enchantements and dimensions.
Here’s example of id log (in this case, vanilla enchantment ids):
0: enchantment.protect.all(net.minecraft.enchantment.EnchantmentProtection)
1: enchantment.protect.fire(net.minecraft.enchantment.EnchantmentProtection)
2: enchantment.protect.fall(net.minecraft.enchantment.EnchantmentProtection)
3: enchantment.protect.explosion(net.minecraft.enchantment.EnchantmentProtection)
4: enchantment.protect.projectile(net.minecraft.enchantment.EnchantmentProtection)
5: enchantment.oxygen(net.minecraft.enchantment.EnchantmentOxygen)
6: enchantment.waterWorker(net.minecraft.enchantment.EnchantmentWaterWorker)
7: enchantment.thorns(net.minecraft.enchantment.EnchantmentThorns)
8: enchantment.waterWalker(net.minecraft.enchantment.EnchantmentWaterWalker)
9: enchantment.frostWalker(net.minecraft.enchantment.EnchantmentFrostWalker)
10:
11:
12:
13:
14:
15:
16: enchantment.damage.all(net.minecraft.enchantment.EnchantmentDamage)
17: enchantment.damage.undead(net.minecraft.enchantment.EnchantmentDamage)
18: enchantment.damage.arthropods(net.minecraft.enchantment.EnchantmentDamage)
19: enchantment.knockback(net.minecraft.enchantment.EnchantmentKnockback)
20: enchantment.fire(net.minecraft.enchantment.EnchantmentFireAspect)
21: enchantment.lootBonus(net.minecraft.enchantment.EnchantmentLootBonus)
22:
23:
Anti id conflict also logs mods, and generated .mods files can be opened in excel for fancy view.
This is what you will see with only AIC installed
All logs are located in config/Anti Id Conflict folder. In this folder, you can also find config files: main.cfg to control logging and useless (???) limits.cfg.
AIC is temporarily closed source and issues go in comments section.
Mod Spotlights:
Update soon…
How to install:
- Install the version of Forge that corresponds with the mod (http://files.minecraftforge.net/ Choose the installer version of Forge)
- Download the Anti Id Conflict Mod.
- Drop the entire zipped file into your mods folder (Search %appdata% on your PC then go into .minecraft, then mods(create this folder if it is not there))
- Open Minecraft and make sure your profile is set to Forge
- Start Minecraft and enjoy!
This mod is made by elix_x, all credit to modder. Visit the original mod thread here for all info.