AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-11 16:28:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,671 Commits 29 Branches 143 Tags
Commit Graph

4671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Florian Nücke
70b6895726 Adjusted _VERSION to be standard compliant. 2015-07-07 20:03:35 +02:00
Florian "Sangar" Nücke
bfe2a6a297 Merge pull request #1272 from Ionaru/patch-1 
Corrected 2 small mistakes
 2015-07-06 21:21:00 +02:00
Florian "Sangar" Nücke
6683a5bd49 Merge pull request #1269 from payonel/patch-4 
ignore closed pipe writes to dead coroutines and fix stalled pipes
 2015-07-06 21:18:48 +02:00
Florian "Sangar" Nücke
f9976335aa Merge pull request #1271 from cyber01/RU_doc 
Added Copy to clipboard for chat tooltips to RU lang.
 2015-07-06 21:18:00 +02:00
Jeroen Akkerman
726a6bcfcd Corrected 2 small mistakes 
"will contain of the components" -> "will contain all of the components" on line 7
Added a comma on line 13, action -> result.
 2015-07-06 20:56:50 +02:00
payonel
2efd2704f8 ignore closed pipe writes to dead coroutines and fix stalled pipes 
ignore all writes to a closed pipe stream if next is dead and fix piped quiet commands from stalling the pipe chain

resolves issue: #1267
resolves issue: #1265

this is a merge(a squish) of two previous PR's:
https://github.com/MightyPirates/OpenComputers/pull/1266
https://github.com/MightyPirates/OpenComputers/pull/1268
 2015-07-05 09:38:41 -07:00
Florian Nücke
fada3e43d9 Should fix sided issue. 2015-07-04 11:45:56 +02:00
Florian Nücke
829038f612 Might fix screens blanking out until the first update in some cases. Maybe. 2015-07-04 11:02:07 +02:00
Florian Nücke
c0a7b84c3a Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-07-04 01:33:33 +02:00
Florian Nücke
50f7f74353 Fixed lighting issue with hover boots. I think. 2015-07-04 01:33:14 +02:00
Florian "Sangar" Nücke
26a7939584 Merge pull request #1264 from payonel/patch-1 
Fix coroutine resume in piped programs by forcing write on close.
 2015-07-03 23:58:36 +02:00
payonel
b60c784eed fix coroutine resume by forcing write on close 2015-07-03 14:41:07 -07:00
Florian Nücke
2f899190a3 Fixes #1259. 2015-07-02 20:02:44 +02:00
Florian Nücke
f8b0995b07 Get rid of remaining "match start" component.list calls in BIOS/OpenOS, fixes #1255. 2015-06-29 21:57:10 +02:00
Łukasz Magiera
120b4911b1
Added loading bar 
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
 2015-06-29 18:53:14 +02:00
Łukasz Magiera
4ca825d234
More final fixes 
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
 2015-06-29 01:56:48 +02:00