add settings, update intllib

minetest-mods / moreores

More Ores

https://content.minetest.net/packages/Calinou/moreores/

zlib License

26 stars 30 forks source link

add settings, update intllib #12

Closed FaceDeer closed 6 years ago

FaceDeer commented 7 years ago

This doesn't change the mod's default behaviour, but it updates some things under the hood and it adds more accessible user options.

All of the settings that were in _config.txt are now exposed in-game via the advanced settings menu
In addition, I added a setting that allows this mod to remove the default "steel + copper = bronze" reaction. This is off by default, though.
Also added settings allowing each of the three metals to be disabled individually. They're all enabled by default.
Updated intllib support to use the most recent version of that mod. In the process I discovered that the silver and mithril hoes lack translation, but I figured it'd be best to leave that be rather than Google Translate it. They're available in the .po files for translators to fix.
Expanded readme a bit.
Added optional loot mod support

HybridDog commented 7 years ago

neat

kaeza commented 7 years ago

I would personally prefer if the strings for e.g. items and tools were translated individually. There's some work at kaeza:i18n (along with other stuff) addressing that. It is based on this pull request.

It also seems you bundle lots of unrelated stuff. I can split and rebase that later, keeping authors, if you need.

FaceDeer commented 7 years ago

Sure, though I'm not really concerned about the attribution for my stuff so incorporate it however is most convenient. Next time I'll put out pull requests bit by bit rather than doing one big pass through everything. :)

sofar commented 7 years ago

rebase needed, as well as approval - this is overdue.

FaceDeer commented 7 years ago

Still new to some of this git magic. What do I need to do here? Redo the changes in a fresh branch?

HybridDog commented 7 years ago

$ git fetch https://github.com/minetest-mods/moreores $ git rebase FETCH_HEAD fix conflicts $ git add -A && git rebase --continue if there're more conflicts, fix them too $ git rebase -i FETCH_HEAD replace all "pick"s with "s"s except the first one, save and exit set the message of the squashed commit, save and exit $ git push origin master -f

If you want to add changes to your latest commit instead of making a new one, use $ git add -A && git commit --amend

FaceDeer commented 7 years ago

Okay, I think I've got it sorted.

sofar commented 7 years ago

Well, that seemed to have made it worse.

sofar commented 7 years ago

My method is (and you're gonna have to throw away the merge commit and start from 3355729:

... go to your own branch where you have these changes ... $ git pull --rebase origin master

then fix the conflicts that appear $ git add $files $ git rebase --continue

.. push it over your own remote branch... $ git push -f facedeersremotename

FaceDeer commented 7 years ago

Well, I managed to revert the merge, so I guess that made things un-worse. But none of these other incantations seem to be having any effect.

At this point I think it'll be faster and easier for me to just blow this all away and redo my changes on a fresh fork, it looks like learning what's actually going on with git will be a major task best left for a situation when there's no time pressure. The changes that got made to the main repository after I did my own stuff are pretty trivial and should be simple to merge by hand.

sofar commented 7 years ago

conflicts

sofar commented 6 years ago

@facedeer let's just close this? if someone wants to redo this, it's just as easy to redo from scratch.

FaceDeer commented 6 years ago

Okay.