Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nether Factories! #70

Open
wants to merge 52 commits into
base: master
Choose a base branch
from
Open

Nether Factories! #70

wants to merge 52 commits into from

Conversation

ribagi
Copy link

@ribagi ribagi commented Aug 27, 2014

If anything goes wrong, I blame Rourke for making me do this.

@ttk2
Copy link
Owner

ttk2 commented Aug 27, 2014

so I assume just merge this one not he earlier one?

On Wed, Aug 27, 2014 at 3:52 PM, ribagi notifications@github.com wrote:

If anything goes wrong, I blame Rourke for making me do this.

You can merge this Pull Request by running

git pull https://github.com/ribagi/FactoryMod master

Or view, comment on, or merge it at:

#70
Commit Summary

  • Super Awesome Nether
  • Update config.yml
  • Update config.yml
  • Update config.yml
  • Update config.yml
  • Update config.yml
  • Update config.yml
  • Update config.yml
  • Updatting to self git
  • Update config.yml
  • s
  • Update FactoryObject.java
  • Update FactoryModPlugin.java
  • Update ItemList.java
  • Update InteractionResponse.java
  • Update NamedItemStack.java
  • Update config.yml
  • Update FactoryObject.java
  • Update FactoryModPlugin.java
  • Update FactoryModPlugin.java
  • Update FactoryModPlugin.java
  • Update BaseFactory.java
  • Update FactoryModListener.java
  • Update NoteStackListener.java
  • Update FactoryModManager.java
  • Update PrintingPressManager.java
  • Update ProductionManager.java
  • Update ProductionManager.java
  • Nether Comps
  • Update config.yml
  • Update config.yml
  • Update config.yml
  • Update config.yml
  • Update config.yml
  • Update config.yml

File Changes

Patch Links:


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

@jjj5311
Copy link

jjj5311 commented Aug 28, 2014

Ribagi can you try to push this commit to my main repo (should be same as ttks)

https://github.com/jjj5311/FactoryMod

I want to try using some of gits merge tools to see what works

return useFuelOnTeleport;
}

}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could these errors be caused by the line endings with no new lines? Rourkes had this as well.

ribagi added 17 commits October 2, 2014 23:03
This prevents the aspects factory from even being created. Don't put this on the live server until Nether factories are released or an off switch is written into the costs, such as 1 bedrock.
Todo:

       - Burn_Lump_Charcoal
       - Stone_Knife
       - Blast_Furnace
       - Burn_Briquette
       - Iron_hammer
       - Faceting machine
       - Burn_White_Charcoal
       - Diamond_Drill_Heads
       - Faceting_Machine
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants