aboutsummaryrefslogtreecommitdiff
path: root/display_api/copyright.txt
diff options
context:
space:
mode:
authororwell96 <orwell@bleipb.de>2018-12-03 23:17:35 +0100
committerorwell96 <orwell@bleipb.de>2018-12-03 23:17:35 +0100
commit8928f78ee6305e29ed8d3b9395fcb6564c984fdf (patch)
treecd250c2b98d7131158e3744efe238780cec73fec /display_api/copyright.txt
parenteccdad46ef2b38cd061aab7ae6bcb252a67c2218 (diff)
parenta3e0d36a68247cac40349d9089fe3c71546d75e8 (diff)
downloaddisplay_modpack-master.tar.gz
display_modpack-master.tar.bz2
display_modpack-master.zip
Merge remote-tracking branch 'upstream/master'HEADmaster
Resolved conflicts by reordering of files
Diffstat (limited to 'display_api/copyright.txt')
-rw-r--r--display_api/copyright.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/display_api/copyright.txt b/display_api/copyright.txt
new file mode 100644
index 0000000..e242c7c
--- /dev/null
+++ b/display_api/copyright.txt
@@ -0,0 +1,5 @@
+Code by Pierre-Yves Rollo (pyrollo)
+Contributors:
+(gpcf): Compatibility with signs lib
+(Thomas--S): Fix /clearobjects bug
+(12Me21): on_place and on_rotate improvements