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: BuildCraft/BuildCraft
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7.2.x
Choose a base ref
...
head repository: XOR19/BuildCraft
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7.2.x
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 10 commits
  • 3 files changed
  • 1 contributor

Commits on May 24, 2016

  1. fixes #3311

    +blocks without boundingbox can be in a robots path
    ! Robots can now pickup items one block away (if block has a bounding
    box)
    XOR19 committed May 24, 2016
    Configuration menu
    Copy the full SHA
    25d1c6c View commit details
    Browse the repository at this point in the history

Commits on May 25, 2016

  1. fixes #3320

    enchantment animation isn't hiding the item any more in the GuiList and
    moved second row of slots one pixel down, cause it didn't align with the
    background.
    XOR19 committed May 25, 2016
    Configuration menu
    Copy the full SHA
    69a9f55 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'refs/remotes/BuildCraft/7.2.x' into 7.2.x

    # Conflicts:
    #	common/buildcraft/core/properties/WorldPropertyIsFreePath.java
    XOR19 committed May 25, 2016
    Configuration menu
    Copy the full SHA
    4c7cdbd View commit details
    Browse the repository at this point in the history
  3. fixes #3226

    The closest hitbox is not the last one in the list
    XOR19 committed May 25, 2016
    Configuration menu
    Copy the full SHA
    b07655c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    fc246b9 View commit details
    Browse the repository at this point in the history
  5. map location update (as planned in the forum)

    only blank map locations can be witten by right click, used map
    locations can be cleard with sneak right click. left click passes throug
    item to block
    XOR19 committed May 25, 2016
    Configuration menu
    Copy the full SHA
    eebe586 View commit details
    Browse the repository at this point in the history
  6. fix some maplocation problems

    fixes that used and cleaned maplocations can stack again, by removing
    nbttag.
    fixes paths, they are saved as an nbtlist of intarrays but later the
    list was asked for tagcompound.
    XOR19 committed May 25, 2016
    Configuration menu
    Copy the full SHA
    4ebd5d7 View commit details
    Browse the repository at this point in the history
  7. wrong encompass calculation

    only updated the min, not the max bounds
    XOR19 committed May 25, 2016
    Configuration menu
    Copy the full SHA
    b21bd2f View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    aae271f View commit details
    Browse the repository at this point in the history
  9. min should be max

    fix for my mistake
    XOR19 committed May 25, 2016
    Configuration menu
    Copy the full SHA
    9dd50d7 View commit details
    Browse the repository at this point in the history
Loading