Skip to content
This repository has been archived by the owner on May 26, 2024. It is now read-only.

Add RawOre items and processing #879

Merged
merged 23 commits into from
May 22, 2024
Merged

Add RawOre items and processing #879

merged 23 commits into from
May 22, 2024

Commits on Apr 20, 2024

  1. Add RawOre items and processing

    @Ethryan
    Ethryan committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    90336e0 View commit details
    Browse the repository at this point in the history

  2. Added textures

    @Ethryan
    Ethryan committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    09215cc View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. Change to a switch instead of elseif and add shouldFortune check 

    Removed isNatural check since GT++ Ores aren't TileEntities
    @Ethryan
    Ethryan committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    e3058d4 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. update

    @Dream-Master
    Dream-Master committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    c2bd560 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into dev 

    # Conflicts:
#	dependencies.gradle
    @Dream-Master
    Dream-Master committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    d441f37 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. Merge branch 'master' into dev

    @Dream-Master
    Dream-Master authored Apr 30, 2024
    Configuration menu
    Copy the full SHA
    a962526 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into dev 

    # Conflicts:
#	dependencies.gradle
    @Dream-Master
    Dream-Master committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    56846a4 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2024

  1. Merge branch 'master' into dev 

    # Conflicts:
#	dependencies.gradle
    @Dream-Master
    Dream-Master committed May 4, 2024
    Configuration menu
    Copy the full SHA
    b3505cb View commit details
    Browse the repository at this point in the history

  2. update

    @Dream-Master
    Dream-Master committed May 4, 2024
    Configuration menu
    Copy the full SHA
    e84cafc View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. Fixed the controller texture for the turbines.

    @Pilad
    Pilad committed May 7, 2024
    Configuration menu
    Copy the full SHA
    beaf0cf View commit details
    Browse the repository at this point in the history

  2. The file is not called anywhere? 

    This file doesn't seem to be used anywhere. Maybe it's worth removing?
    @Pilad
    Pilad committed May 7, 2024
    Configuration menu
    Copy the full SHA
    d3a93bf View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. Merge remote-tracking branch 'Pilad/master' into dev

    @Dream-Master
    Dream-Master committed May 9, 2024
    Configuration menu
    Copy the full SHA
    9f027cc View commit details
    Browse the repository at this point in the history

  2. update

    @Dream-Master
    Dream-Master committed May 9, 2024
    Configuration menu
    Copy the full SHA
    1f05bad View commit details
    Browse the repository at this point in the history

  3. update

    @Dream-Master
    Dream-Master committed May 9, 2024
    Configuration menu
    Copy the full SHA
    4344636 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. Merge branch 'master' into dev

    @Dream-Master
    Dream-Master authored May 10, 2024
    Configuration menu
    Copy the full SHA
    cb756d3 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2024

  1. Update random code

    @Ethryan
    Ethryan committed May 18, 2024
    Configuration menu
    Copy the full SHA
    98fa8f0 View commit details
    Browse the repository at this point in the history

  2. fixed

    @Ethryan
    Ethryan committed May 18, 2024
    Configuration menu
    Copy the full SHA
    115d821 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into ore-change

    @Dream-Master
    Dream-Master authored May 18, 2024
    Configuration menu
    Copy the full SHA
    c96e5b1 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. Add Silk Touch

    @Ethryan
    Ethryan committed May 22, 2024
    Configuration menu
    Copy the full SHA
    b678f26 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into ore-change

    @Dream-Master
    Dream-Master authored May 22, 2024
    Configuration menu
    Copy the full SHA
    478027c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into ore-change

    @Dream-Master
    Dream-Master authored May 22, 2024
    Configuration menu
    Copy the full SHA
    68b97ee View commit details
    Browse the repository at this point in the history

  4. Update dependencies.gradle

    @Ethryan
    Ethryan committed May 22, 2024
    Configuration menu
    Copy the full SHA
    09640a2 View commit details
    Browse the repository at this point in the history

  5. Update dependencies.gradle

    @Dream-Master
    Dream-Master authored May 22, 2024
    Configuration menu
    Copy the full SHA
    78d70fc View commit details
    Browse the repository at this point in the history