AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-27 06:53:08 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,276 Commits 29 Branches 143 Tags
Commit Graph

4276 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
534921a256 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/resources/assets/opencomputers/lang/fr_FR.lang
	src/main/scala/li/cil/oc/util/InventoryUtils.scala
 2015-06-07 12:16:36 +02:00
Florian Nücke
ac117c2fb5 Added annotation to allow marking classes implementing SimpleComponent to be skipped, closes #1194. 2015-06-07 12:10:57 +02:00
Florian Nücke
adf68933ab Didn't need you after all. 2015-06-07 12:03:11 +02:00
Florian Nücke
dcdf5f5215 Merge branch 'patch-3' of https://github.com/LizzyTrickster/OpenComputers into master-MC1.7.10 2015-06-07 12:01:57 +02:00
Florian Nücke
3d7386e83b Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-06-07 12:01:34 +02:00
Florian Nücke
6c8370bcb3 Fixed interaction of agents with trapped chests adjacent to normal chests in certain orientations (would insert/remove into/from wrong chest). Closes #1205. 2015-06-07 12:01:22 +02:00
Florian Nücke
8dd4d841a9 Before I forget again, make AE2 filter ignore size if passed size is zero (makes it easier to use stacks pulled from databases as filters, since the size field doesn't have to be nulled). 2015-06-07 11:41:07 +02:00
Florian Nücke
6905742614 Drones are now Ninjas. Closes #1204. 2015-06-07 11:31:24 +02:00
Florian Nücke
a028beadec Added annotation that can be added to architectures, to mark them as not requiring memory (e.g. to allow assembling MCUs with CPUs configured to those architectures without memory being present). Closes #1201. 2015-06-07 11:25:21 +02:00
Florian Nücke
bc29a0b70d Fixed crafting of Lua BIOS and OpenOS floppy using "initialized" items (i.e. EEPROM or floppy that had been installed in a computer/disk drive before). Closes #1199. 2015-06-07 10:58:55 +02:00
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
d0fb7d4552 Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8 2015-05-26 15:25:39 +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
2abd68845f Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8 
Conflicts:
	build.properties
 2015-05-26 15:10:34 +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