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

Commits on Jan 24, 2021

  1. * Added Hand argument to IItemUseManager#canStartUsing 

    * Changed pick block for surface rocks to material dust, added stone dust to dropped items.
* Added deflect functionality to nano saber - WIP.
    @Archengius
    Archengius committed Jan 24, 2021
    Configuration menu
    Copy the full SHA
    891e9e7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:GregTechCE/GregTech 

    � Conflicts:
�	src/main/java/gregtech/common/items/behaviors/NanoSaberBehavior.java
    @Archengius
    Archengius committed Jan 24, 2021
    Configuration menu
    Copy the full SHA
    c259bec View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2021

  1. * Changed item collector to instantly pick up items instead of suckin… 

    …g them in

* Block breaker can now accept filter to filter which blocks it will try to break.
* Some unfinished work on block breaker [WIP]
    @Archengius
    Archengius committed Jan 30, 2021
    Configuration menu
    Copy the full SHA
    69d27c3 View commit details
    Browse the repository at this point in the history
Loading