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: BlockServerProject/BlockServer
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: BlockServerProject/BlockServer
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: network
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 14 commits
  • 36 files changed
  • 4 contributors

Commits on Jan 9, 2016

  1. Update README.md

    @jython234
    jython234 committed Jan 9, 2016
    Configuration menu
    Copy the full SHA
    3f57857 View commit details
    Browse the repository at this point in the history

  2. I am so confused right now.

    @jython234
    jython234 committed Jan 9, 2016
    Configuration menu
    Copy the full SHA
    053f0e6 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2016

  1. ~Updates

    @Exerosis
    Exerosis committed Jan 10, 2016
    2 Configuration menu
    Copy the full SHA
    ca4d1d8 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' 

    # Conflicts:
#	src/main/java/org/blockserver/core/modules/network/NetworkConverter.java
#	src/main/java/org/blockserver/core/modules/player/Player.java
    @Exerosis
    Exerosis committed Jan 10, 2016
    Configuration menu
    Copy the full SHA
    b37655b View commit details
    Browse the repository at this point in the history

  3. Fix everything up I think

    @jython234
    jython234 committed Jan 10, 2016
    Configuration menu
    Copy the full SHA
    bd90a22 View commit details
    Browse the repository at this point in the history

  4. Example handler

    @jython234
    jython234 committed Jan 10, 2016
    Configuration menu
    Copy the full SHA
    59e697f View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2016

  1. ~Another attempt at networking, unfinished.

    @Exerosis
    Exerosis committed Jan 11, 2016
    2 Configuration menu
    Copy the full SHA
    dcfcc87 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2016

  1. ~A failed attempt at networking... ;(

    @Exerosis
    Exerosis committed Jan 12, 2016
    Configuration menu
    Copy the full SHA
    0923105 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2016

  1. ~A working attempt at networking, but I'm still not really happy with… 

    … it, please help me out guys!!!
    @Exerosis
    Exerosis committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    a1e7181 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2016

  1. added javadocs, implemented setBlockMaterial in WorldModule

    @butcher211
    butcher211 committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    ce3d5a5 View commit details
    Browse the repository at this point in the history

  2. added some basic javadocs to make it easier later

    @butcher211
    butcher211 committed Jan 17, 2016
    Configuration menu
    Copy the full SHA
    f8b19f2 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2016

  1. Merge pull request #156 from butcher211/master 

    Added some Javadocs
    @jython234
    jython234 committed Jan 18, 2016
    Configuration menu
    Copy the full SHA
    67984bd View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2016

  1. Set the base for the network rewrite.

    @jython234
    jython234 committed Jan 25, 2016
    Configuration menu
    Copy the full SHA
    b07c1b6 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2016

  1. Some basic networking finished.

    @jython234
    jython234 committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    00aa9a3 View commit details
    Browse the repository at this point in the history
Loading