AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-14 17:56:34 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,587 Commits 29 Branches 143 Tags
Commit Graph

4587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Łukasz Magiera
43057f1ee1
Update Plan9k 
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
 2015-07-21 03:56:15 +02:00
Florian "Sangar" Nücke
991ef66a3a Merge pull request #1311 from ChickenNuggers/patch-2 
tostring( reason ) is never false/nil
 2015-07-19 18:50:35 +02:00
Charles Heywood
ed0acd06e5 tostring( reason ) is never false/nil 2015-07-19 05:06:28 -05:00
Florian Nücke
1278c5c68a Re-baking netsplitter model after texture restitching, should fix #1294. 2015-07-17 19:24:26 +02:00
Florian Nücke
dcae8155f8 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/util/ItemUtils.scala
 2015-07-17 19:17:47 +02:00
Florian Nücke
cdcbcc44b8 Merge branch 'master-MC1.7.10' of https://github.com/CaitlynMainer/OpenComputers into master-MC1.7.10 2015-07-17 19:13:18 +02:00
Florian Nücke
a1b164a134 Added blacklist for recipe inputs for disassembler. Default contains fire for chainmail blacklisting. Closes #1296. 2015-07-17 19:12:56 +02:00
Florian Nücke
f26ae2d1c6 Hi. 2015-07-17 19:12:17 +02:00
Florian Nücke
08f20645d4 Fixed division by zero in manual, closes #1295. 2015-07-17 19:11:43 +02:00
Caitlyn
d2f2b2d9ea Cause I R Dumb. 2015-07-15 20:56:19 -05:00
Florian Nücke
997271d2d0 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-07-12 20:08:06 +02:00
Florian Nücke
0be41dd4ec Merge branch 'master' of https://github.com/magik6k/OpenComputers into master-MC1.7.10 2015-07-12 20:01:44 +02:00
Florian Nücke
22fe034609 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	build.gradle
	build.properties
	src/main/scala/li/cil/oc/client/renderer/block/Assembler.scala
	src/main/scala/li/cil/oc/common/block/Assembler.scala
	src/main/scala/li/cil/oc/common/block/Geolyzer.scala
	src/main/scala/li/cil/oc/common/block/Hologram.scala
	src/main/scala/li/cil/oc/common/block/PowerDistributor.scala
	src/main/scala/li/cil/oc/common/block/Screen.scala
	src/main/scala/li/cil/oc/integration/fmp/CablePart.scala
 2015-07-12 14:09:21 +02:00
Florian Nücke
f1360f8158 Make redstone visually connect to net splitter. Closes #1293. 2015-07-12 14:04:56 +02:00
Florian Nücke
cf2a4e89d3 Merge branch 'master-MC1.7.10' of https://github.com/Kubuxu/OpenComputers into master-MC1.7.10 
Conflicts:
	build.gradle
 2015-07-12 14:01:00 +02:00
Florian Nücke
0fa31e854e Version bump. 2015-07-12 13:58:10 +02:00
Florian Nücke
5a9a6ef3bc Make assembler render without fake full bright to avoid Colored Lights' rendering to break. 
Also added Colored Lights integration while I was at it.
 2015-07-12 13:57:53 +02:00
Kubuxu
4305aae16d Make hollow covers from FMP close on Cables 2015-07-12 12:22:28 +02:00
Kubuxu
77751ffb15 Fix ProjectRed dependency 2015-07-12 12:22:12 +02:00
Florian Nücke
e979b09628 Merge branch 'master-MC1.7.10' of https://github.com/Kubuxu/OpenComputers into master-MC1.7.10 2015-07-12 12:22:06 +02:00
Florian Nücke
919e3c9397 Fixes drivers to use proper tier getter. Closes #1291. 2015-07-12 12:21:09 +02:00
Florian Nücke
e0f9f04e35 Made the touch inversion check in screens use the origin block as it should. First part of #1291. 2015-07-12 12:20:33 +02:00
Kubuxu
6b3c3f98d7 Make hollow covers from FMP close on Cables 2015-07-12 11:45:02 +02:00
Kubuxu
db87266128 Fix ProjectRed dependency 2015-07-12 11:44:51 +02:00
Florian Nücke
2ee0715bff Adjust default orientation of screen. 2015-07-11 23:18:21 +02:00
Florian Nücke
c29366d2f0 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/Disassembler.scala
	src/main/scala/li/cil/oc/util/InventoryUtils.scala
 2015-07-11 22:52:35 +02:00
Florian Nücke
1b502f5a41 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-07-11 22:48:54 +02:00
Florian Nücke
5c8572ba37 Added command to spawn a creative computer with the basic stuff built-in. Closes #1289. 2015-07-11 22:48:41 +02:00
Florian Nücke
94fd8d14b1 Finished Power Advantage integration, looks like it works the way it should! Closes #1248. 2015-07-11 21:52:47 +02:00
Florian Nücke
7366d8d07a Some more adjustments for 1.8. 2015-07-11 19:55:54 +02:00
Florian Nücke
8c13372194 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/Textures.scala
	src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/item/HoverBootRenderer.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/block/SimpleBlock.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/Common.scala
 2015-07-11 19:44:24 +02:00
Florian "Sangar" Nücke
24337f02f4 Merge pull request #1286 from cyber01/RU_doc 
Added Netsplitter to RU lang
 2015-07-11 19:36:14 +02:00
cyber01
dd46e54cbd Correction2 2015-07-11 20:28:06 +03:00
cyber01
c3958ff642 Correction 2015-07-11 20:12:11 +03:00
cyber01
3b96f1ff6d Add Netsplitter to RU lang 2015-07-11 20:09:34 +03:00
Florian Nücke
45e76ca452 String with Power Advantage integration. 2015-07-11 18:50:43 +02:00
Florian Nücke
e21667d3d7 Only for the @return comment. Too confusing. 2015-07-11 18:38:52 +02:00
Florian Nücke
df3b5337a2 Building a better tomorrow. 2015-07-11 18:33:05 +02:00
Florian Nücke
5daac497fa okthen intellij 2015-07-11 18:22:47 +02:00
Florian Nücke
9540cb44fb Netsplitter it is. Also added a recipe for it and added sound when toggling states. 2015-07-11 18:04:21 +02:00
Florian Nücke
74763fa141 Removed deprecated call in bee converter, closes #1283. 2015-07-11 17:14:27 +02:00
Florian Nücke
f71bf06a59 All the right offsets in all the wrong places. Should fix #1278. 
mktime is still borked kinda, but cba to fix that now ._.
 2015-07-11 17:06:16 +02:00
Florian Nücke
b7ae7554fc Added toggle thinger. Closes #1273. 
Name still subject to change, but using the leading one from the poll for now.
 2015-07-11 13:58:57 +02:00
Florian Nücke
4f218cc4f8 Also using patched block renderer for inventory rendering where applicable. Fixes item rendering of 3d printer, holograms etc. 2015-07-11 13:57:02 +02:00
Florian Nücke
b48e2fdc8f Fixed initial redstone state of non-updating blocks such as prints. 2015-07-11 13:55:31 +02:00
Florian Nücke
3a930fa938 Added newline to md5sum and sha256sum. Fixes #1275. 2015-07-10 23:08:46 +02:00
Florian Nücke
26eaf983f8 May or may not fix assertion error in R-Tree. Time will tell. 2015-07-10 23:07:34 +02:00
Florian Nücke
5c60af946d Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-07-09 22:24:21 +02:00
Florian "Sangar" Nücke
179eafb673 Merge pull request #1276 from NPException42/patch-1 
David from the movie "A.I. - Artificial Intelligence"
 2015-07-09 22:24:10 +02:00
NPException
117a6a8888 added David from the A.I. movie 
https://en.wikipedia.org/wiki/A.I._Artificial_Intelligence
 2015-07-08 13:14:16 +02:00