mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-06-26 15:13:21 +00:00
Code Issues Releases Wiki Activity
2b077554f7
CC-Tweaked/src/main
History
SquidDev 2b077554f7 Merge branch 'mc-1.14.x' into mc-1.15.x 
# Conflicts:
#	gradle.properties
#	src/main/java/dan200/computercraft/client/render/MonitorTextureBufferShader.java
#	src/main/java/dan200/computercraft/client/render/TileEntityMonitorRenderer.java
#	src/main/java/dan200/computercraft/core/apis/handles/HandleGeneric.java
#	src/main/java/dan200/computercraft/shared/Config.java
#	src/main/java/dan200/computercraft/shared/network/NetworkHandler.java
#	src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java
#	src/main/java/dan200/computercraft/shared/turtle/apis/TurtleAPI.java
#	src/main/resources/data/computercraft/lua/rom/help/changelog.txt
#	src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt
2020-06-16 09:24:14 +01:00
..
java/dan200/computercraft Merge branch 'mc-1.14.x' into mc-1.15.x 2020-06-16 09:24:14 +01:00
resources Merge branch 'mc-1.14.x' into mc-1.15.x 2020-06-16 09:24:14 +01:00