1791c485af
Conflicts: build.gradle common/buildcraft/transport/BlockGenericPipe.java common/buildcraft/transport/render/PipeItemRenderer.java
24 lines
137 B
Plaintext
24 lines
137 B
Plaintext
#eclipse
|
|
.project
|
|
.classpath
|
|
.metadata
|
|
org.*
|
|
bin
|
|
|
|
#idea
|
|
*.iml
|
|
*.ipr
|
|
*.iws
|
|
.idea
|
|
out
|
|
|
|
#gradle
|
|
build
|
|
.gradle
|
|
|
|
#runtime
|
|
run
|
|
|
|
#mac
|
|
.DS_Store
|