Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: walterhiggins/ScriptCraft
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: pandr/ScriptCraft
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 5 commits
  • 4 files changed
  • 1 contributor

Commits on Nov 24, 2014

  1. Non jsp commands

    @pandr
    pandr committed Nov 24, 2014
    Configuration menu
    Copy the full SHA
    ff5cb3b View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2014

  1. Added support for mods folder

    @pandr
    pandr committed Dec 2, 2014
    Configuration menu
    Copy the full SHA
    ef32ecf View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2015

  1. Merge remote-tracking branch 'upstream/master' 

    Conflicts:
	lib/CanaryMod-1.7.10-1.1.3-SNAPSHOT-shaded.jar
	src/main/js/lib/scriptcraft.js
    @pandr
    pandr committed Feb 2, 2015
    Configuration menu
    Copy the full SHA
    5b66fd3 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2015

  1. Untested, but compiles against canarys dynamic commands system

    @pandr
    pandr committed Feb 8, 2015
    Configuration menu
    Copy the full SHA
    91748ea View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2015

  1. Merge remote-tracking branch 'upstream/master'

    @pandr
    pandr committed Feb 16, 2015
    Configuration menu
    Copy the full SHA
    80517e6 View commit details
    Browse the repository at this point in the history
Loading