search

Civcraft / Citadel

Do not open issues here; open them on the maintained fork @ DevotedMC
https://github.com/DevotedMC/Citadel
BSD 3-Clause "New" or "Revised" License
6 stars 23 forks source link

Working version of Acid Timer (Do not Merge Yet, Testing required) #149

Closed ProgrammerDan closed 8 years ago

ProgrammerDan commented 8 years ago

Also rebased against latest master. Going to deploy on devoted and time the DB upgrade, to give counsel if this is a safe upgrade for Civcraft or no.

In any case it'll be a null change for civ's behavior. I'll be testing that to be certain against CivTest.

ttk2 commented 8 years ago

ok to test

ProgrammerDan commented 8 years ago

I still have to push this to Civtest for a civ-safe test, but it's been running on Devoted all week and no issues so far, so that's a plus.

ttk2 commented 8 years ago

Merge at will then. On Dec 2, 2015 10:44 AM, "Daniel Boston" notifications@github.com wrote:

I still have to push this to Civtest for a civ-safe test, but it's been running on Devoted all week and no issues so far, so that's a plus.

— Reply to this email directly or view it on GitHub https://github.com/Civcraft/Citadel/pull/149#issuecomment-161359331.

ProgrammerDan commented 8 years ago

@ttk2 Note: The DB upgrade took 5 seconds with 267,000 entries for Devoted. Should be linear, in terms of estimating time for upgrade for Civcraft if this goes online.

ttk2 commented 8 years ago

that's going to be fun, might not bother with it.

ProgrammerDan commented 8 years ago

Well, I'm content to keep this as a non-merging feature branch, if there's no genuine interest in ever using split acid and block maturation times.

Be a bit of a pain in the ass for me to keep things organized, but no skin off Civ's back :D.

If that's the case though, I will apply my last commit selectively against master as without it, Citadel will break in a terrible way. I learned this by experience, hehe.

ttk2 commented 8 years ago

no go ahead and merge it.

On Thu, Dec 3, 2015 at 9:00 AM, Daniel Boston notifications@github.com wrote:

Well, I'm content to keep this as a non-merging feature branch, if there's no genuine interest in ever using split acid and block maturation times.

Be a bit of a pain in the ass for me to keep things organized, but no skin off Civ's back :D.

If that's the case though, I will apply my last commit selectively against master as without it, Citadel will break in a terrible way. I learned this by experience, hehe.

— Reply to this email directly or view it on GitHub https://github.com/Civcraft/Citadel/pull/149#issuecomment-161665837.

rourke750 commented 8 years ago

@ProgrammerDan All features are good. Getting people to merge any changes that are positive are looked forward to. Also I'm pretty sure we have a faster machine then devoted so it might be quicker. Thanks for the changes though.

ShadedJon commented 8 years ago

Current machine has these specs:

CPU: Intel Atom C2758 2.40GHz RAM: 8GB Hard drive(s): 2x 120GB SSD

So yeah, most likely.

Is this the build I tested for you Dan? Don't want this fix to get forgotten about

ProgrammerDan commented 8 years ago

Yes it is. Looks like I need to rebase it before I can merge it though :)

ProgrammerDan commented 8 years ago

Closing, way out of sync.