Merge branch 'gradle-3' of https://github.com/Thorfusion/Mekanism into gradle-3

This commit is contained in:
maggi373 2021-07-21 23:11:12 +02:00
commit dfb6960df9
3 changed files with 3 additions and 3 deletions

View file

@ -5,9 +5,9 @@ name: Check code
on: on:
push: push:
branches: [ 1.7.10 ] branches: [ gradle-3 ]
pull_request: pull_request:
branches: [ 1.7.10 ] branches: [ gradle-3 ]
jobs: jobs:
build: build:

View file

@ -32,3 +32,4 @@ fix EnergyMatrix use IC2 cable(EnergyNetBug) connecting valve as a loop to fully
#### maggi373 : #### maggi373 :
fix for bin dupe bug, removed the ability to stack bins, quick solution but it works fix for bin dupe bug, removed the ability to stack bins, quick solution but it works
test

1
gradlew vendored
View file

@ -8,7 +8,6 @@
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS="" DEFAULT_JVM_OPTS=""
JAVA_HOME="C:\Program Files\AdoptOpenJDK\jdk-8.0.265.01-hotspot\"
APP_NAME="Gradle" APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"` APP_BASE_NAME=`basename "$0"`