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

4661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
bba3404e77 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-07-25 14:54:32 +02:00
Florian Nücke
00da2ee53e Should fix potential deadlock when machines get disposed while they're running. Closes #1322. 2015-07-25 14:53:57 +02:00
Florian Nücke
88b4f3b5b7 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/init/Items.scala
 2015-07-25 14:12:16 +02:00
Florian Nücke
284598d9a2 Version bump. 2015-07-25 14:11:42 +02:00
Florian Nücke
1d0a0b98ad Added redirects for T2 and T3 data card manual pages. 2015-07-25 14:10:58 +02:00
Florian Nücke
066a0f81c9 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/resources/assets/opencomputers/textures/items/DataCard.png
	src/main/resources/assets/opencomputers/textures/items/DataCard.png.mcmeta
	src/main/resources/assets/opencomputers/textures/items/DataCard0.png
	src/main/resources/assets/opencomputers/textures/items/DataCard0.png.mcmeta
	src/main/resources/assets/opencomputers/textures/items/dataCard.png
	src/main/resources/assets/opencomputers/textures/items/dataCard.png.mcmeta
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
 2015-07-25 14:10:22 +02:00
Florian Nücke
2aa54dd199 Reworked textures for T2 and T3 data card. 2015-07-25 12:20:49 +02:00
Florian Nücke
4508cc4a80 Fixed data lib only providing methods of the card installed at the time it is initialized (libs are cached so this broke things when moving to a different tier of data card). 2015-07-25 12:03:37 +02:00
Florian Nücke
c447588442 Removed data.tier(), doesn't really fit IMHO and no other component does that (and feature checks are more robust anyway). 
Made simple md5/sha256 on data card T2+ call super for basic variant to make sure they behave absolutely the same as T1.
Just a bit of code shuffling.
 2015-07-25 12:02:42 +02:00
Florian Nücke
12a37cf83a Make dataCard -> dataCard1 for consistence; if any addon mod used Items.get("dataCard") they'll have to adjust, but that chance is slim, I'd say... 
Also adjusted recipes a bit, recursive upgrading fits better into the hardmode set.
 2015-07-25 11:21:43 +02:00
Florian Nücke
fd96b309a5 Formatting of lua programs (two space indentation), also feature based check in gpg.lua which is more in line with other components. 2015-07-25 11:19:17 +02:00
Florian Nücke
f27e0c1d5a Avoid potential match errors in data card driver and specific environment for different tiers. 2015-07-25 11:16:53 +02:00
Florian Nücke
d24a02f04b Merge branch 'master-MC1.7.10' of https://github.com/makkarpov/OpenComputers into master-MC1.7.10 
Conflicts:
	build.gradle
 2015-07-25 11:08:40 +02:00
Florian Nücke
f89fb5bfea Merge branch 'master-MC1.7.10' of https://github.com/Shuudoushi/OpenComputers into master-MC1.7.10 2015-07-25 11:08:03 +02:00
Florian Nücke
d510fe9fb0 Merge branch 'master-MC1.7.10' of https://github.com/CaitlynMainer/OpenComputers into master-MC1.7.10 2015-07-25 11:07:43 +02:00
Florian Nücke
074ee33f76 Merge branch 'patch-1' of https://github.com/Chlikikijleelgus/OpenComputers into master-MC1.7.10 2015-07-25 11:07:06 +02:00
Florian Nücke
77cdd50e5c Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-07-25 11:07:02 +02:00
Caitlyn
71ecf0dacf Wobbo is Wobbo. 
[14:56:01] <@Mimiru>Wobbo, has anyone ever gotten your In game MC name?
[14:56:14] <Wobbo>Mimiru: Wobbo
[15:06:37] <Wobbo> R: 25 G: 120 B: 200
 2015-07-24 15:08:17 -05:00
Shuudoushi
15345a736b Fixed spelling and grammar errors within the man pages. 2015-07-24 13:40:32 -05:00
Florian Nücke
20f6e83539 tl;dr 2015-07-24 19:02:16 +02:00
Florian Nücke
1fbde2c866 Removed unused and now dead dep on resonant engine that caused build errors. 2015-07-24 18:59:15 +02:00
Chlikikijleelgus
46130b036b Added some new robot names 2015-07-24 05:22:18 -07:00
makkarpov
3f69cab11a Add tiered data cards: 
- Tier 1: Basic data card operations
- Tier 2: Basic operations + AES-CBC encryption/decryption
- Tier 3: Basic + AES-CBC + ECDSA + ECDH

- Textures are now looking like a stubs that are waiting for better alternatives
- Recipes by Kubuxu
- gpg.lua program (simple version without keychain)

--- Change log after squash ---

+ Changed to ThreadLocal instance of SecureRandom instead of genSeed function
+ Added readable errors in case of invalid key type
+ Added SecureRandom instance to EC key generator to avoid unnecessary creation of another one.
+ Added check that data card is present and `data.present()` function
+ Fixed typo at 029915d595/src/main/resources/assets/opencomputers/lua/component/data/lib/data.lua (L15)
 2015-07-24 13:06:18 +03:00
Florian "Sangar" Nücke
1d5542d995 Merge pull request #1317 from magik6k/master 
Update Plan9k
 2015-07-21 10:04:30 +02:00
Ł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