search

Civcraft / RealisticBiomes

Do not open issues here; open them on the maintained fork @ DevotedMC
https://github.com/DevotedMC/RealisticBiomes
7 stars 14 forks source link

getRate() rewrite #44

Closed Maxopoly closed 9 years ago

Maxopoly commented 9 years ago

This should basically solve the problems with glowstone_ignore_biome and implement, what gipsy wrote as pseudo code here: https://github.com/Civcraft/RealisticBiomes/issues/42

CivcraftBot commented 9 years ago

Can one of the admins verify this patch? Type 'ok to test' to test.

WildWeazel commented 9 years ago

ok to test

WildWeazel commented 9 years ago

build is good, mind squashing the commits?

Maxopoly commented 9 years ago

Sorry for asking such a stupid question, but how do I do that? I tried as suggested by pretty much every google result:

git rebase -i master~4 master

But it just told me this: http://i.imgur.com/Uvteryc.png And I couldn't find any fix for that even with tryhard googling

ttk2 commented 9 years ago

is your version of git up to date? you might need to reinstall it, it looks like it thinks the rebase component is corrupt.

Maxopoly commented 9 years ago

Didn't solve it, sorry. I gave both you and @WildWeazel push access to my RB repo, could one of you just squash it, please?

ProgrammerDan commented 9 years ago

I can do it if you want.

Maxopoly commented 9 years ago

Gave you push access, thanks a lot!

ProgrammerDan commented 9 years ago

going to make you a new pull request so I don't screw up your local history with a --force here.

ProgrammerDan commented 9 years ago

Replaced with #45 , closing this as a result.