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

Dev #16

Merged
merged 72 commits into from
Jul 26, 2017
Merged

Dev #16

merged 72 commits into from
Jul 26, 2017

Commits on Dec 17, 2016

  1. Configuration menu
    Copy the full SHA
    aeff3a8 View commit details
    Browse the repository at this point in the history
  2. Test for using Git

    BuildTools committed Dec 17, 2016
    Configuration menu
    Copy the full SHA
    2cc1c4c View commit details
    Browse the repository at this point in the history
  3. Lambdas for everyone!

    BuildTools committed Dec 17, 2016
    Configuration menu
    Copy the full SHA
    5d29246 View commit details
    Browse the repository at this point in the history
  4. Some fixes 1.0

    BuildTools committed Dec 17, 2016
    Configuration menu
    Copy the full SHA
    31a8123 View commit details
    Browse the repository at this point in the history
  5. Changed some things

    brainiac94 committed Dec 17, 2016
    Configuration menu
    Copy the full SHA
    a6c858a View commit details
    Browse the repository at this point in the history
  6. Merge origin/dev into dev

    brainiac94 committed Dec 17, 2016
    Configuration menu
    Copy the full SHA
    c76beb7 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2016

  1. Configuration menu
    Copy the full SHA
    384e4ec View commit details
    Browse the repository at this point in the history
  2. Initial

    BuildTools committed Dec 18, 2016
    Configuration menu
    Copy the full SHA
    752f6da View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2016

  1. Removed Artifacts and Elemental Arrows

    BuildTools committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    f967955 View commit details
    Browse the repository at this point in the history
  2. Fixed Anthropomorphism

    BuildTools committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    98b76f0 View commit details
    Browse the repository at this point in the history
  3. Minor config changes

    BuildTools committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    8755877 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8ce2fc1 View commit details
    Browse the repository at this point in the history
  5. Enchantment Bug Fixes

    BuildTools committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    644a675 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    17f15cd View commit details
    Browse the repository at this point in the history
  7. Merge origin/dev into dev

    brainiac94 committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    e3e04ac View commit details
    Browse the repository at this point in the history
  8. Enchantment Bug Fixes

    BuildTools committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    ca0292a View commit details
    Browse the repository at this point in the history
  9. Enchantment Bug Fixes

    BuildTools committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    fa8408d View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    4cacc1e View commit details
    Browse the repository at this point in the history
  11. Merge origin/dev into dev

    brainiac94 committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    844f57d View commit details
    Browse the repository at this point in the history
  12. More fixes

    BuildTools committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    9eb6db4 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    c00d4d3 View commit details
    Browse the repository at this point in the history
  14. Merge origin/dev into dev

    brainiac94 committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    1e5811d View commit details
    Browse the repository at this point in the history
  15. Even more fixes

    BuildTools committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    6231830 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    4b8a829 View commit details
    Browse the repository at this point in the history
  17. Merge origin/dev into dev

    brainiac94 committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    5d39c4a View commit details
    Browse the repository at this point in the history
  18. Even more fixes

    BuildTools committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    b21c6ae View commit details
    Browse the repository at this point in the history
  19. Merge origin/dev into dev

    BuildTools committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    cab6bb2 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2016

  1. Configuration menu
    Copy the full SHA
    9658b95 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8b9d1c9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0a7b657 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    43f1e61 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e8f8256 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    465e0a8 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    999c3fd View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    43c14b7 View commit details
    Browse the repository at this point in the history
  9. Updated readme

    brainiac94 committed Dec 21, 2016
    Configuration menu
    Copy the full SHA
    ef37623 View commit details
    Browse the repository at this point in the history
  10. Even more fixes

    BuildTools committed Dec 21, 2016
    Configuration menu
    Copy the full SHA
    854f7c5 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2016

  1. Configuration menu
    Copy the full SHA
    8649d48 View commit details
    Browse the repository at this point in the history
  2. Deduplicated adapter code

    brainiac94 committed Dec 22, 2016
    Configuration menu
    Copy the full SHA
    b1995df View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0619186 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    24cccde View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2af4799 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    96c72ab View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    3804bc6 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    506638a View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    1973af8 View commit details
    Browse the repository at this point in the history
  10. 1.10.2

    BuildTools committed Dec 22, 2016
    Configuration menu
    Copy the full SHA
    8eb738e View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    ff7985d View commit details
    Browse the repository at this point in the history
  12. Fixes

    BuildTools committed Dec 22, 2016
    Configuration menu
    Copy the full SHA
    0fca147 View commit details
    Browse the repository at this point in the history
  13. Merge origin/dev into dev

    Conflicts:
    	Zenchantments/src/main/java/zedly/zenchantments/CustomEnchantment.java
    BuildTools committed Dec 22, 2016
    Configuration menu
    Copy the full SHA
    e4458fb View commit details
    Browse the repository at this point in the history
  14. Merge origin/dev into dev

    Conflicts:
    	Zenchantments/src/main/java/zedly/zenchantments/CustomEnchantment.java
    BuildTools committed Dec 22, 2016
    Configuration menu
    Copy the full SHA
    e848d2f View commit details
    Browse the repository at this point in the history
  15. Removed unnecessary field

    brainiac94 committed Dec 22, 2016
    Configuration menu
    Copy the full SHA
    ce5c979 View commit details
    Browse the repository at this point in the history
  16. Merge origin/dev into dev

    Conflicts:
    	Zenchantments/src/main/java/zedly/zenchantments/CustomEnchantment.java
    BuildTools committed Dec 22, 2016
    Configuration menu
    Copy the full SHA
    761408c View commit details
    Browse the repository at this point in the history
  17. Merge origin/dev into dev

    Conflicts:
    	Zenchantments/src/main/java/zedly/zenchantments/CustomEnchantment.java
    brainiac94 committed Dec 22, 2016
    Configuration menu
    Copy the full SHA
    5043757 View commit details
    Browse the repository at this point in the history
  18. Changes

    BuildTools committed Dec 22, 2016
    Configuration menu
    Copy the full SHA
    7e62430 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    d3bb76b View commit details
    Browse the repository at this point in the history
  20. Merge origin/dev into dev

    Conflicts:
    	Zenchantments/src/main/java/zedly/zenchantments/CustomEnchantment.java
    brainiac94 committed Dec 22, 2016
    Configuration menu
    Copy the full SHA
    17a412a View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2016

  1. Configuration menu
    Copy the full SHA
    7674939 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c4f21d5 View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2016

  1. Configuration menu
    Copy the full SHA
    3cb461c View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2017

  1. Configuration menu
    Copy the full SHA
    c9a4448 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2017

  1. Configuration menu
    Copy the full SHA
    af6404c View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2017

  1. Configuration menu
    Copy the full SHA
    0d893da View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2017

  1. Fixed CCE in Spikes

    brainiac94 committed Apr 17, 2017
    Configuration menu
    Copy the full SHA
    0189ccc View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2017

  1. Configuration menu
    Copy the full SHA
    2d9148d View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2017

  1. Configuration menu
    Copy the full SHA
    3313c3b View commit details
    Browse the repository at this point in the history
  2. No commit message

    brainiac94 committed Jun 25, 2017
    Configuration menu
    Copy the full SHA
    9adb86e View commit details
    Browse the repository at this point in the history
  3. Merge origin/dev into dev

    brainiac94 committed Jun 25, 2017
    Configuration menu
    Copy the full SHA
    5149c7b View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2017

  1. Configuration menu
    Copy the full SHA
    6075523 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2017

  1. Configuration menu
    Copy the full SHA
    081c1a7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    36df770 View commit details
    Browse the repository at this point in the history
  3. Removed debug lines, argh

    brainiac94 committed Jul 7, 2017
    Configuration menu
    Copy the full SHA
    90b1b29 View commit details
    Browse the repository at this point in the history