AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-26 22:43:40 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,754 Commits 29 Branches 143 Tags
Commit Graph

4754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
51563efaaa Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.7.10 v1.5.18+hotfix.2 2015-09-21 23:49:58 +02:00
Florian Nücke
5addcdddb1 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/command/SimpleCommand.scala
 2015-09-21 23:49:29 +02:00
Florian Nücke
29793e780e Fixes #1453. 2015-09-21 23:45:43 +02:00
Florian Nücke
0fd80661c2 Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8 2015-09-21 21:14:29 +02:00
Florian Nücke
003b69f30a Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.7.10 v1.5.18+hotfix.1 2015-09-21 21:14:18 +02:00
Florian Nücke
2b06e066fb Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-09-21 21:13:22 +02:00
Florian Nücke
f190fa2aaf Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/nanomachines/provider/ParticleProvider.scala
	src/main/scala/li/cil/oc/common/tileentity/Charger.scala
 2015-09-21 21:13:07 +02:00
Florian Nücke
72ae2ca626 Derp. 2015-09-21 21:12:44 +02:00
Florian Nücke
e0f4a0c81e Disable chance of stuff breaking when disassembling creatively, closes #1447. 2015-09-21 21:04:14 +02:00
Florian Nücke
bff25a3cca Include particle name in hint, closes #1450. 2015-09-21 20:58:49 +02:00
Florian Nücke
e6922f86c3 Increase the likelihood of some behaviors not being available at all in a configuration. 2015-09-21 20:55:25 +02:00
Florian Nücke
2b970bc65a Added command to generate debug nanomachine configuration (/oc_debugNanomachines or /oc_dn). 2015-09-21 20:54:02 +02:00
Florian Nücke
f3f7fb559e Only enable EnderIO integration for 2.2; will update to 2.3 when it's out of beta. 2015-09-21 19:33:05 +02:00
Florian Nücke
f440245b93 Fix potential stackoverflow in charger, closes #1451. 2015-09-21 19:32:34 +02:00
Florian Nücke
d66fb2a5f4 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-09-20 20:41:08 +02:00
Florian Nücke
a5f42623d3 Fixes #1449. 2015-09-20 20:40:12 +02:00
Florian "Sangar" Nücke
07fd47e842 Merge pull request #1446 from cyber01/RU_doc 
Fix #1445 in RU translation
 2015-09-20 17:40:02 +02:00
cyber01
979dea5337 Fix #1445 in RU translation 2015-09-20 16:57:27 +04:00
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
c24eea3673 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.7.10 
Conflicts:
	build.properties
v1.5.18 		2015-09-20 13:36:12 +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