factory mod pull

[rourke750]

No description provided.

[ttk2]

what exactly does this do? I can guess but I want to be sure.

On Thu, Aug 14, 2014 at 7:06 PM, rourke750 notifications@github.com wrote:

---

You can merge this Pull Request by running

git pull https://github.com/rourke750/FactoryMod-1 master

Or view, comment on, or merge it at:

#67
Commit Summary

• Merge pull request Update Config.yml to fix Advanced Redstone Factory #1 from ttk2/master
• nether factory
• Update config.yml
• Merge pull request Add printing press config changes to the config template #4 from dbear20/patch-3

File Changes

• M config.yml
  https://github.com/ttk2/FactoryMod/pull/67/files#diff-0 (243)

Patch Links:

• https://github.com/ttk2/FactoryMod/pull/67.patch
• https://github.com/ttk2/FactoryMod/pull/67.diff

—
Reply to this email directly or view it on GitHub
#67.

[rourke750]

Nether factories
On Aug 14, 2014 10:53 PM, "ttk2" notifications@github.com wrote:

what exactly does this do? I can guess but I want to be sure.

On Thu, Aug 14, 2014 at 7:06 PM, rourke750 notifications@github.com
wrote:

---

You can merge this Pull Request by running

git pull https://github.com/rourke750/FactoryMod-1 master

Or view, comment on, or merge it at:

#67
Commit Summary

• Merge pull request Update Config.yml to fix Advanced Redstone Factory #1 from ttk2/master
• nether factory
• Update config.yml
• Merge pull request Add printing press config changes to the config template #4 from dbear20/patch-3

File Changes

• M config.yml
  https://github.com/ttk2/FactoryMod/pull/67/files#diff-0 (243)

Patch Links:

• https://github.com/ttk2/FactoryMod/pull/67.patch
• https://github.com/ttk2/FactoryMod/pull/67.diff

—
Reply to this email directly or view it on GitHub
#67.

—
Reply to this email directly or view it on GitHub
#67 (comment).

[ttk2]

that's verbose...

On Fri, Aug 15, 2014 at 5:28 AM, rourke750 notifications@github.com wrote:

Nether factories
On Aug 14, 2014 10:53 PM, "ttk2" notifications@github.com wrote:

what exactly does this do? I can guess but I want to be sure.

On Thu, Aug 14, 2014 at 7:06 PM, rourke750 notifications@github.com
wrote:

---

You can merge this Pull Request by running

git pull https://github.com/rourke750/FactoryMod-1 master

Or view, comment on, or merge it at:

#67
Commit Summary

• Merge pull request Update Config.yml to fix Advanced Redstone Factory #1 from ttk2/master
• nether factory
• Update config.yml
• Merge pull request Add printing press config changes to the config template #4 from dbear20/patch-3

File Changes

• M config.yml
  https://github.com/ttk2/FactoryMod/pull/67/files#diff-0 (243)

Patch Links:

• https://github.com/ttk2/FactoryMod/pull/67.patch
• https://github.com/ttk2/FactoryMod/pull/67.diff

—
Reply to this email directly or view it on GitHub
#67.

—
Reply to this email directly or view it on GitHub
#67 (comment).

—
Reply to this email directly or view it on GitHub
#67 (comment).

[rourke750]

This is exactly what is on civtest right now.

[ttk2]

can't merge, conflicts.

[rourke750]

I'm bad at git. No idea how to fix.

On Sun, Aug 17, 2014 at 10:02 PM, ttk2 notifications@github.com wrote:

can't merge, conflicts.

—
Reply to this email directly or view it on GitHub
#67 (comment).