Merge remote-tracking branch 'origin/1.12.2' into 1.12.2

Browse Source

# Conflicts:
#	build.gradle
#	src/main/java/com/github/vfyjxf/nee/NotEnoughEnergistics.java
#	src/main/java/com/github/vfyjxf/nee/network/NEENetworkHandler.java

...

This commit is contained in:

vfyjxf committed 2021-08-22 23:33:43 +08:00

2 parents dc584e9d6c 657fb6dfba

commit c6a2dad0de

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available