AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-08 06:41:23 -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
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
Florian Nücke
75f7ddcfac Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-09-18 00:04:59 +02:00
Florian Nücke
a8c145e071 Increase "duration" to keep potion effects at to make stuff work that needs time to activate (such as nausea and nightvision), make it instantly stop on disabling instead. 
Fixed onEnable/onDisable callbacks.
 2015-09-18 00:04:36 +02:00
cyber01
615c496e90 Added NanoMachines to RU translation 2015-09-18 01:05:31 +04:00
Florian Nücke
e16b6051db Fixed hover boot lighting. More or less. 2015-09-17 22:46:04 +02:00
Florian Nücke
460306904b Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/traits/Hub.scala
 2015-09-17 22:39:10 +02:00
Florian Nücke
0385ee2571 Adjustments for 1.8. 2015-09-17 22:38:38 +02:00
Florian Nücke
fab26fb92c Fix typo in JavaDoc and newly introduced crash bug (few commits back). 2015-09-17 22:38:19 +02:00
Florian Nücke
cb433d3b01 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	build.properties
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/client/Textures.scala
	src/main/scala/li/cil/oc/common/PacketBuilder.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/common/tileentity/Charger.scala
	src/main/scala/li/cil/oc/server/agent/Player.scala
	src/main/scala/li/cil/oc/util/BlockPosition.scala
	src/main/scala/li/cil/oc/util/ExtendedWorld.scala
 2015-09-17 22:15:33 +02:00
Florian Nücke
9e4a22bb15 Merge branch 'sh-patch' of https://github.com/payonel/OpenComputers into master-MC1.7.10 2015-09-17 21:30:13 +02:00
Florian Nücke
9eebcce7d5 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-09-17 21:29:03 +02:00
Florian Nücke
8f3a0a5b66 Energy based, configurable (and potentially deadly) buff system: nanomachines! 
Also made Grog consumable, closing #410.
 2015-09-17 21:28:22 +02:00
Florian "Sangar" Nücke
23ac58c80a Merge pull request #1431 from makkarpov/patch-1 
Correct links in readme.md
 2015-09-17 17:55:27 +02:00
Maxim Karpov
085309587d Correct links in readme.md 2015-09-16 11:55:30 +03:00
payonel
da2c5ed305 Fix and improve the tab complete in sh 
use path as given by user in sh shell in tab completion, and do not show resolved path

don't add space to single directory completion in case user wants to add more directories

escape magic chars in possible hint handler from user input on command line
 2015-09-14 13:33:58 -07:00
Florian "Sangar" Nücke
217650e963 Merge pull request #1426 from cyber01/RU_doc 
Added transposer to manual index in RU
 2015-09-14 20:19:06 +02:00
cyber01
b4a632896e Added transposer to manual index in RU 2015-09-14 20:43:51 +04:00
Florian "Sangar" Nücke
f3e1aef16b Merge pull request #1424 from Vexatos/patch-25 
Added transposer to manual index.
 2015-09-14 16:36:55 +02:00
Vexatos
d63c1cfbe1 Added transposer to manual index. 2015-09-14 15:50:36 +02:00
Florian "Sangar" Nücke
2162f31d56 Merge pull request #1407 from chaoskagami/nek-fix-2 
Update to the proper final repo for NeK. Or so I hope, at least.
 2015-09-14 12:49:47 +02:00
Florian Nücke
9c27e85800 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/Microcontroller.scala
	src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
 2015-09-13 13:30:24 +02:00
Florian Nücke
4e4e5d3ba3 Creative tablets won't run out of energy anymore... 2015-09-13 13:28:08 +02:00
Florian Nücke
db9b373d12 Fixed server racks and MCUs actually having a node on the front face that just was never used internally. 2015-09-13 13:27:48 +02:00
Florian Nücke
7617717390 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
 2015-09-11 18:20:49 +02:00