AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-12 00:35:56 -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
Lizzy
a16a819bb2 of > off 2015-06-05 23:24:06 +01:00
Florian "Sangar" Nücke
ab2c532091 Merge pull request #1197 from Mazdallier/patch-3 
Update fr_FR.lang
 2015-06-05 12:07:36 +02:00
Yves
964f349d47 Update fr_FR.lang 2015-06-04 16:34:22 +02:00
Florian "Sangar" Nücke
6c7c28d550 Merge pull request #1196 from cyber01/RU_doc 
Added Creative APU and Hover Boots to Russian manual.
 2015-06-04 14:39:37 +02:00
cyber01
53deb56518 Added Creative APU and Hover Boots 2015-06-04 15:17:20 +03:00
Florian Nücke
7f56153be6 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/item/data/PrintData.scala
	src/main/scala/li/cil/oc/util/ExtendedWorld.scala
 2015-06-01 21:58:13 +02:00
Florian Nücke
70f85edf3e Dangit Minecraft! *shakes fist* 
Fixes second issue mentioned in #1193.
 2015-06-01 21:48:36 +02:00
Florian Nücke
812ee34d8f Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/block/Print.scala
 2015-06-01 21:12:36 +02:00
Florian Nücke
91bf28e803 Notify neighbors of redstone emitting prints when they're broken, fixes #1193. 2015-06-01 21:07:39 +02:00
Florian Nücke
ce3b9e42a1 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/Proxy.scala
 2015-05-31 14:19:26 +02:00
Kubuxu
029915d595 Add MD5, CRC-32. Add md5sum, base64 programs. Rename sha256 to sha256sum program. Add recipe. 2015-05-31 14:16:48 +02:00
Florian Nücke
a64fd8c4ba Prevent potential NPE in Microcontroller if TE description packet is requested before the first TE update. Closes #1192. 
Synchronize sound updates, may prevent potential CMEs.
 2015-05-31 14:15:05 +02:00
Florian Nücke
92c3ffc1e7 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/Proxy.scala
 2015-05-30 22:36:40 +02:00
Florian Nücke
dc80da8d39 That's it, I've had enough. 2015-05-30 22:34:15 +02:00
Kubuxu
657bc7dcdf Added DataCard. 2015-05-30 13:43:17 +02:00
Florian Nücke
4e660edc55 Fixed the adapter. Closes #1188. 2015-05-30 12:08:02 +02:00
Florian Nücke
605d642787 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-05-30 12:02:36 +02:00
Florian Nücke
9afe70778b Formatting. 2015-05-30 12:01:10 +02:00
Florian Nücke
654eb90a9f Merge branch 'devspace-fix' of https://github.com/Kubuxu/OpenComputers into master-MC1.7.10 2015-05-30 11:44:51 +02:00
Florian Nücke
4d0db0955d Added missing newline to cp usage. 2015-05-30 11:44:20 +02:00
Kubuxu
a07cadd1b0 Fix FileSystem in devspace when path contains spaces 2015-05-29 20:25:13 +02:00
Florian Nücke
94ae4e43a5 Added some special code for mods using InventoryPlayer.currentItem instead of InventoryPlayer.getCurrentItem. 
Such as OpenBlocks' /dev/null. Oh well, it *almost* worked out of the box, just placing didn't.
 2015-05-29 11:52:07 +02:00
Florian Nücke
806ed9ab85 Making some more Lua 5.3 functions available and preparing for making UTF-8 lib available. 
The latter of which will require a recompile of the natives, so not yet.
 2015-05-28 14:36:38 +02:00
Florian Nücke
887b37dd54 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-05-28 12:51:59 +02:00
Florian Nücke
763f43c00f Fixed keyboards behaving as solid blocks. 2015-05-28 12:51:45 +02:00
Florian Nücke
cf83f5d82b Allow changing radius in which beeps can be heard in config (up to 32), closes #1180. 2015-05-28 12:11:41 +02:00
Florian Nücke
5977b92a06 Added missing callback documentation, closes #1183. 2015-05-28 11:24:36 +02:00
Florian Nücke
3c4e54b987 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/Proxy.scala
 2015-05-26 21:57:05 +02:00
Florian Nücke
230a3d620e Bump version. 2015-05-26 21:32:15 +02:00
Florian Nücke
206f4320b5 Added Lua 5.3 arch. Needs a good bit of testing before I'll enable the arch by default. 2015-05-26 21:31:42 +02:00
Florian Nücke
f80b0067f3 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-05-26 15:24:13 +02:00
Florian Nücke
cea6eba7eb Aha! So it did matter after all. 2015-05-26 15:23:45 +02:00
Florian Nücke
7a5a97b9ab Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/block/Print.scala
 2015-05-26 14:57:31 +02:00
Florian Nücke
78c628aed0 Bump version. 2015-05-26 14:55:47 +02:00
Florian Nücke
6cbd608fa4 Fixed APU textures, closes #1178. 2015-05-26 14:13:14 +02:00
Florian Nücke
ddaa3e8ff0 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/block/ServerRack.scala
 2015-05-26 14:08:27 +02:00
Florian Nücke
67556ad192 Added missing flag to recognize Electrical Age as power provider (so power was disabled if that was the only power mod). Closes #1177. 2015-05-26 13:41:43 +02:00
Florian Nücke
9c23524c24 Added missing HostAware interface to hover upgrade driver. Closes #1176. 2015-05-26 13:38:41 +02:00
Florian Nücke
891638d88a Fixes potential client crash when placing server at y-level 0. Closes #1175. 2015-05-26 13:21:51 +02:00
Florian Nücke
610c5b8fdb Should fix potential NPE in cable rendering. 2015-05-24 13:57:00 +02:00
Florian Nücke
d0e94c473e Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/block/Keyboard.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala
 2015-05-24 12:23:29 +02:00
Florian Nücke
2b965c0685 Fixes damage bar display on hover boots being inverted. Closes #1170. 2015-05-24 12:15:58 +02:00
Florian Nücke
4db5107913 Allow robots to power up other robots (and computers) by sneak-rightclicking them. 
Doesn't work for powering up creative robots/cases, but meh.
 2015-05-24 12:03:20 +02:00
Florian Nücke
c822567745 Recognize APU as graphics card when generating warnings in assembler for suggested components. 2015-05-24 11:59:58 +02:00
Florian Nücke
04b611eb8f Fixed keyboards not dropping if the block they're attached to is being destroyed and immibis' microblocks is present. 2015-05-24 11:50:19 +02:00
Florian Nücke
ccf00ae3c3 Make creative APU be colored appropriately. 2015-05-24 11:24:08 +02:00
Florian Nücke
37e0403927 Added creative tier APU (acts as T3 CPU+GPU). Closes #1169. 2015-05-24 11:15:56 +02:00
Florian Nücke
e14ba3be7a Added geolyzer and nav upgrade to creative tablet. Closes #1171. 2015-05-24 10:58:30 +02:00
Florian Nücke
948f344404 Fixes craftables not being loadable after 5ad8ef331dc6b7dcbc0f11e15ca5019f0e578844. 2015-05-23 17:25:30 +02:00
Florian Nücke
de7f95d24b Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	build.properties
	src/main/resources/assets/opencomputers/recipes/default.recipes
	src/main/scala/li/cil/oc/common/item/Tablet.scala
	src/main/scala/li/cil/oc/integration/Mods.scala
 2015-05-23 14:37:06 +02:00