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

4599 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
ebdbdab065 Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8 2015-09-20 13:43:05 +02:00
Florian Nücke
575d13291e Ignore more stuff that's not on 1.8 yet in build. 2015-09-20 13:42:42 +02:00
Florian Nücke
caead52eb1 Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8 
Conflicts:
	build.properties
 2015-09-20 13:39:26 +02:00
Florian Nücke
e8543c1dc5 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
 2015-09-20 12:31:19 +02:00
Florian Nücke
e9ad0f2e6a Should fix issues rendering some items when equipped by robots, closing #1429. 2015-09-20 12:30:18 +02:00
Florian Nücke
e738a66be7 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-09-20 11:33:24 +02:00
Florian Nücke
b5b7a44196 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-09-20 11:33:02 +02:00
Florian Nücke
30f8e17918 Fixes #1445. 2015-09-20 11:29:32 +02:00
Florian "Sangar" Nücke
62cbce1e3f Merge pull request #1441 from cyber01/RU_doc 
Some tweaks to the nanomachines in RU translation
 2015-09-19 23:19:36 +02:00
Florian "Sangar" Nücke
52372335ab Merge pull request #1439 from xPucTu4/patch-1 
Update robot.names
 2015-09-19 23:19:23 +02:00
Florian "Sangar" Nücke
09f718d774 Merge pull request #1443 from LizzyTrickster/patch-4 
name change and added chappie
 2015-09-19 23:18:46 +02:00
Lizzy
5375d923c8 name change and added chappie 2015-09-19 22:04:52 +01:00
cyber01
103d520377 Some tweaks to the nanomachines in RU translation 2015-09-19 20:43:10 +04:00
Hristo Bogdanov
7bd6ff7e46 Update robot.names 2015-09-19 17:32:54 +03:00
Florian Nücke
9b07f0f91b Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/IMC.scala
	src/main/scala/li/cil/oc/common/nanomachines/provider/DisintegrationProvider.scala
	src/main/scala/li/cil/oc/integration/Mods.scala
	src/main/scala/li/cil/oc/integration/opencomputers/ModOpenComputers.scala
	src/main/scala/li/cil/oc/integration/util/Wrench.scala
 2015-09-19 15:13:44 +02:00
Florian Nücke
6a6adfddde Copy-pasta, my old friend, we meet again. 2015-09-19 14:59:30 +02:00
Florian Nücke
772e98bb28 Replace all uses of getCurrentEquippedItem with getHeldItem. Technically the same, but more generic. 2015-09-19 14:56:24 +02:00
Florian Nücke
2aa4093973 Added direct support for a few more wrenches (instead of indirectly via them also implementing other, "mainstream" wrench interfaces). 2015-09-19 14:54:03 +02:00
Florian Nücke
531d6a5442 Added isWrench checks to existing wrench integration. 2015-09-19 14:40:36 +02:00
Florian Nücke
29af7e8927 Extended wrench system to allow simple "isWrench" checks without context / checking for usability. 2015-09-19 14:39:56 +02:00
Florian Nücke
c427dcc195 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/item/Analyzer.scala
	src/main/scala/li/cil/oc/common/item/Debugger.scala
	src/main/scala/li/cil/oc/server/component/Agent.scala
	src/main/scala/li/cil/oc/server/component/DebugCard.scala
	src/main/scala/li/cil/oc/server/component/Transposer.scala
	src/main/scala/li/cil/oc/util/InventoryUtils.scala
 2015-09-19 13:16:41 +02:00
Florian Nücke
a6e6e29ac2 Added some checks for fake players to avoid trying to send network messages to them (#1430). 2015-09-19 13:09:22 +02:00
Florian Nücke
3ca9731201 Require scrench to break drones, sneak-right-click powers them on now; also allow them being powered on this way by robots/other drones, closes #1430. 2015-09-19 13:01:25 +02:00
Florian Nücke
d4e257a588 Only try charging players with nanomachines. 2015-09-19 13:00:22 +02:00
Florian Nücke
7760077202 Made sink slot optional when specifying source slot in transposer.transferItem (#1425). 2015-09-19 12:22:31 +02:00
Florian Nücke
36002da462 Make transposer usable as upgrade in microcontrollers. Closes #1425. 2015-09-19 12:05:52 +02:00
Florian Nücke
a4b11f5201 Pulled core transposer logic out into trait. 
More homogenous use of result(Unit, ...) vs. the occasiona result(null, ...)
 2015-09-19 11:42:24 +02:00
Florian Nücke
75a3fee64a Closes #1438. 2015-09-19 11:14:46 +02:00
Florian Nücke
a76bdb4552 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/item/Acid.scala
	src/main/scala/li/cil/oc/common/item/Nanomachines.scala
 2015-09-19 00:55:14 +02:00
Florian Nücke
b78017ca9f Some tweaks to the nanomachines. 
- Provide some player stats.
- Require eating more to reconfigure.
- Drink grog to get rid of them.
- Add hard max of enabled inputs to make it less likely for other players to kill you instantly by enabling all inputs.
- Short enforced delay between commands (and before getting a response).
 2015-09-19 00:52:31 +02:00
Florian Nücke
71ff9c7e2c Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-09-18 22:27:43 +02:00
Florian "Sangar" Nücke
783aa6c1ae Merge pull request #1436 from cyber01/RU_doc 
Added death messages to RU translation
 2015-09-18 20:07:25 +02:00
Florian "Sangar" Nücke
fa960209e8 Merge pull request #1437 from Vexatos/patch-27 
Removed unused config value.
 2015-09-18 19:37:30 +02:00
Vexatos
50b56e1f80 Made OC not crash on startup 2015-09-18 19:33:20 +02:00
cyber01
696260f808 Added death messages to RU translation 2015-09-18 20:24:10 +04:00
Florian Nücke
cce8ae5cec Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-09-18 16:01:07 +02:00
Florian Nücke
1e7bc65870 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-09-18 16:00:47 +02:00
Florian Nücke
13db6ccd7a And this why you ???, kids! 2015-09-18 16:00:35 +02:00
Florian "Sangar" Nücke
ac71c878a2 Merge pull request #1435 from Vexatos/patch-26 
Update en_US.lang
 2015-09-18 15:50:33 +02:00
Vexatos
733f37a13a Update en_US.lang 2015-09-18 15:35:54 +02:00
Florian Nücke
2d56a45b7d Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/event/NanomachinesHandler.scala
	src/main/scala/li/cil/oc/common/nanomachines/provider/DisintegrationProvider.scala
	src/main/scala/li/cil/oc/common/nanomachines/provider/MagnetProvider.scala
	src/main/scala/li/cil/oc/common/nanomachines/provider/ParticleProvider.scala
 2015-09-18 14:52:25 +02:00
Florian Nücke
aef4165da5 Added a reason parameter to onDisable. 
Added new behavior.
Using DamageSources now.
 2015-09-18 14:47:29 +02:00
Florian Nücke
155bf0702c FUCK YOU MINECRAFT. Because *obviously* Potion.isBadEffect is client side only FOR NO FUCKING REASON. [/rant] So yeah, whitelist only it is. 2015-09-18 13:02:34 +02:00
Florian Nücke
6d46cfa478 Added potion whitelist. All bad effects are allowed by default and have to be blacklisted; all good ones have to be whitelisted. 2015-09-18 12:21:45 +02:00
Florian Nücke
10dd699e6e Moved simple base classes for behavior and provider to api.prefab. 2015-09-18 12:08:34 +02:00
Florian Nücke
e0d223df33 onDisable should now properly be called when running out of power, and when player disconnects. 2015-09-18 11:28:48 +02:00
Florian Nücke
8dffdb1927 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-09-18 01:46:25 +02:00
Florian Nücke
fc8e14ff5c Corrected use of max safe input config option. 2015-09-18 01:26:31 +02:00
Florian "Sangar" Nücke
9a07f854eb Merge pull request #1434 from cyber01/RU_doc 
Added NanoMachines to RU translation
 2015-09-18 00:10:56 +02:00
Florian Nücke
7f0582c6ef Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-09-18 00:09:59 +02:00